)]}' { "log": [ { "commit": "a6ad75fbe0944f236e27986c23ca75b7db8cdfd8", "tree": "f85f4e8b6398bf4ec72932662b98a660314c3f4c", "parents": [ "432862667643cf8966a0c727b6772a6bae787da1", "ccbc11770397888cf7780925bb4c7cf1d2f2f80e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jul 16 00:59:33 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 16 00:59:36 2015 +0000" }, "message": "Merge \"Add tools:openDrawer to open a DrawerLayout.\" into mnc-dev" }, { "commit": "432862667643cf8966a0c727b6772a6bae787da1", "tree": "a59e7160d589d65ee7d2bd12a3822bdef89145f3", "parents": [ "a73face3f43d191f8e9b6e8597043be47f86374e", "111dc04a28f0181bf429e5ded9024d3fdff7be50" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jul 16 00:59:15 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 16 00:59:18 2015 +0000" }, "message": "Merge \"Change tools:list_item to listitem.\" into mnc-dev" }, { "commit": "ccbc11770397888cf7780925bb4c7cf1d2f2f80e", "tree": "003bb441315a3b35413636e53b75f7d61149bc59", "parents": [ "111dc04a28f0181bf429e5ded9024d3fdff7be50" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jul 10 17:38:29 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jul 15 16:38:25 2015 -0700" }, "message": "Add tools:openDrawer to open a DrawerLayout.\n\nStore a list of drawer layouts with tools:openDrawer encountered and\ncall openDrawer on them during the post-inflation processing.\n\nChange-Id: Idee299a9af1bb106509a03bb2e8424c372b93dc5\n" }, { "commit": "111dc04a28f0181bf429e5ded9024d3fdff7be50", "tree": "90f4ea372a58cc3a553c1892dd451b20a93e0a63", "parents": [ "5d1654a9439f0ed81ecccecfacda34872270dfcb" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jul 08 12:47:46 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jul 15 16:31:00 2015 -0700" }, "message": "Change tools:list_item to listitem.\n\nThe listitem is already in use for ListView. Reuse the same attribute\nfor RecyclerView rather than creating a new one.\n\nChange-Id: I82aabe7d04fbe3e61645bc427a81c14c454d03c5\n" }, { "commit": "a503b62b1597ba6f5fcff537cecbe2dad1d088f7", "tree": "ea318e576b3487cb66633dfe37b3748be6f31f6a", "parents": [ "1d4247c4cc89c6d62e44ed3115f26579979b44b5" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Jul 15 11:58:27 2015 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Jul 15 11:58:27 2015 -0700" }, "message": "Fix build.\n\nChange-Id: Ib165c32d1d87e971902b4dd7300ccebd65e71a7d\n" }, { "commit": "fd854ee58c5d56f84047007ead9f88a767ae956f", "tree": "8cd12e57928f2984b2da6c9a0872fcb795c5fa94", "parents": [ "987241265b77542f45ce95838c25beeaf3ae6849" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jul 13 18:00:37 2015 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jul 14 18:33:08 2015 -0700" }, "message": "Fix issue #21626564: MMS should be receivied while Dozing\n\nWe now place whoever is receiving the MMS on the temporary\nwhitelist while doing so, so they can get network access to\ndownload it.\n\nThere was also an issue that needed to be fixed where we\nwere no longer updating the list of allowed uids while\ndozing based on their proc states... we now do that.\n\nAlso did a bit of optimization of the temp white list update\npath do the network policy manager, instead of going through\na broadcast we now directly call in to the network policy\nmanager. This also allows us to have a synchronous version\nof updating the list, so we can know the app has network access\nbefore we tell it to do anything.\n\nFinally added battery stats events for things going on and off\nthe whitelist so we can diagnose the behavior there.\n\nChange-Id: Ic7fe010af680034d9f8cb014bb135b2addef7455\n" }, { "commit": "d4fd8c766da8a70e3359bbc7efbbc79496efe71a", "tree": "971bad23792d3f9486e1ef7a0b0fe6f2952c84b9", "parents": [ "b42cb352a350bac198470f65125aa151ecacff13" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Mon Jul 13 19:19:25 2015 -0700" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Tue Jul 14 17:25:42 2015 -0700" }, "message": "Added sendBroadcastMultiplePermissions method\n\nAdded Context.sendBroadcastMultiplePermissions(Intent intent, String[]\nreceiverPermissions) method, which allows an array of required permissions\nto be enforced.\n\nBug: 21852542\nChange-Id: I27c9130e8f004b428452501ebc8a36aabde1f343\n" }, { "commit": "e37520b49da8fc2b7b7501c6dbbe1e6ac984dd9f", "tree": "f7e2e3ca94572f22d8067d571518f845624dfb48", "parents": [ "b4e7283c9afd9fb15ebd63f6ce9b75c9c1af658b" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Tue Jul 14 22:29:21 2015 +0000" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Tue Jul 14 22:29:21 2015 +0000" }, "message": "Revert \"Allow array of required permissions in sendBroadcast\"\n\nThis reverts commit b4e7283c9afd9fb15ebd63f6ce9b75c9c1af658b.\n\nChange-Id: Ie8390964bda5bdfa869cee8f46584043d8e7c664\n" }, { "commit": "b4e7283c9afd9fb15ebd63f6ce9b75c9c1af658b", "tree": "16259cb24eda7170075fb4ff4d90d34c77c2463f", "parents": [ "37511e35ae22ea88539f1137ea2f74c9cb17f60c" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Mon Jul 13 19:19:25 2015 -0700" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Tue Jul 14 12:50:22 2015 -0700" }, "message": "Allow array of required permissions in sendBroadcast\n\nAdded Context.sendBroadcast(Intent intent, String[] receiverPermissions)\nmethod, which allows an array of required permissions to be enforced.\n\nBug: 21852542\nChange-Id: I3b8ff258fa9f3249c344bb8093b820b24eef00c0\n" }, { "commit": "0236e6b2d614abd11678de4cec4ed67b582541ff", "tree": "852432d67d266ddb239d845853fa1a35968025ee", "parents": [ "664251a2fd16e63762be2ca93f2559dc2b134726" ], "author": { "name": "Bart Sears", "email": "bsears@google.com", "time": "Thu Jul 09 21:06:27 2015 -0700" }, "committer": { "name": "Bart Sears", "email": "bsears@google.com", "time": "Thu Jul 09 21:06:27 2015 -0700" }, "message": "Fix the build.\n\nCorrect a typo.\n\nChange-Id: I16131cf7c0ce17fa09dedc67264e8199482cd27e\n" }, { "commit": "2bb3842a06af972888b83088a81258b237ee7bd9", "tree": "7504f557656427a58c9f68a52b009eb281306222", "parents": [ "fede4258fa1bf880c2b88ebea3c886003662fc74" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Thu Jul 09 20:19:41 2015 -0700" }, "committer": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Thu Jul 09 20:22:23 2015 -0700" }, "message": "Fix build\n\nChange-Id: I1b56c07aa5b85662f25158156d2c0eff115e9544\n" }, { "commit": "cd595f1998b1331fe0efba02d96c95ee43e791da", "tree": "1c773632834bbc49ef0d8079b6333bbacd493d19", "parents": [ "490dd90c707de8426a068a90d74ec83c9c11fc83" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 14:38:39 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 14:38:39 2015 -0700" }, "message": "Fix Paint_Delegate.native_getRunAdvance()\n\nBug: 22249573\nChange-Id: I29f7abe6448f439059547e1c1e310d3d651ac2d8\n" }, { "commit": "490dd90c707de8426a068a90d74ec83c9c11fc83", "tree": "61a7a723f18ce96890bd438f73f7d40aa4380fa9", "parents": [ "c71450114131c59bb3a8d65968faae4995cd2345" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 14:38:06 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 14:38:06 2015 -0700" }, "message": "Add a default PackageManager to BridgeContext.\n\nNeeded for EditText.\n\nChange-Id: I6c831467659ce814e86c13e928a2b77c14e1c139\n" }, { "commit": "c71450114131c59bb3a8d65968faae4995cd2345", "tree": "a23d9f1f33f4232b891712034a67ec59a8b2f94d", "parents": [ "008e1fb9ed9ab18726762839bcfc74cb0feb82c8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 13:10:14 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 13:13:48 2015 -0700" }, "message": "Revert \"Replace infinite loop with foreach.\"\n\nThis reverts commit c77f9c76e4142db8dd76a28ad99b8f0395b82eba.\n\nClass.getDeclaredClasses() doesn\u0027t return anonymous inner class and\nhence the change was wrong.\n\nThe revert doesn\u0027t undo the typo fixed in the original change.\n\nChange-Id: Id0595c4bc3db1185dd1ce39808a6b8c3610a1e11\n" }, { "commit": "008e1fb9ed9ab18726762839bcfc74cb0feb82c8", "tree": "0d52517f7e1fe04899e989960c2809edeb58e363", "parents": [ "61f23e9bf7d784e7a52168196758c4f6c6853e77" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 12:24:47 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 12:24:47 2015 -0700" }, "message": "Update intellij project for tools-common sources.\n\nUse the sources.jar for tools-common instead of the environment\nvariable.\n\nChange-Id: Ia1a3e8c32f66610e761bacce08c7eb5915e7ed0f\n" }, { "commit": "61f23e9bf7d784e7a52168196758c4f6c6853e77", "tree": "b7174b180c08f5315c79e16effdc4837246f07ab", "parents": [ "295ef6be084d1c2f22ef25a87e508c1f5c14ee5a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jul 06 18:31:20 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 07 12:24:10 2015 -0700" }, "message": "Implement tools:list_item for RecyclerView.\n\nIt\u0027s now possible to use tools:list_item attribute for RecyclerView to\npoint to a default layout, rather than always using a TextView.\n\nChange-Id: I5d522b2f0ca38b420fddfcb0f73a26d95707da79\n" }, { "commit": "295ef6be084d1c2f22ef25a87e508c1f5c14ee5a", "tree": "68126e176948deabb5b1c19901c176202033d9c0", "parents": [ "d7b846c1814de34f2cea8507907f70618ec7cae0" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jul 06 18:27:00 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jul 06 18:27:00 2015 -0700" }, "message": "Add roundess to configuration\n\nChange-Id: Icc85b38dd091fc5aa13092d6abb06ac169f7b0b5\n" }, { "commit": "d7b846c1814de34f2cea8507907f70618ec7cae0", "tree": "f95f3b05d6f6801b3f82ef7236516b849f9d28a5", "parents": [ "760b1409bc865df5c60f637b8c994eb20888acb8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jul 06 18:26:41 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jul 06 18:26:41 2015 -0700" }, "message": "Update tests per new layoutlib_api\n\nChange-Id: Idc89ffceaf171abcf2b579f4e934b514ef209210\n" }, { "commit": "81f8cd92fa003a8625df1098662d0afa50f07e89", "tree": "fa921cbce2190039d26695775f5b43b8d48f2bf0", "parents": [ "32207e3c66f9b7979a6d465b87eb531327916081", "3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed Jul 01 17:51:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 01 17:51:18 2015 +0000" }, "message": "am 3ce79f6c: am 96496e2d: Merge \"Build fix after changing IWindowSession.\" into cw-d-mr1-dev\n\n* commit \u00273ce79f6c0c3435eca05ea34c5a8b34ac59bcb992\u0027:\n Build fix after changing IWindowSession.\n" }, { "commit": "c77f9c76e4142db8dd76a28ad99b8f0395b82eba", "tree": "b9a1629b9288ab652e4bbb01b3928bfe9c97f18a", "parents": [ "5d1eaf4a197130f561b16c4ed083cf016b20ab92" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jun 30 14:30:55 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jun 30 15:36:34 2015 -0700" }, "message": "Replace infinite loop with foreach.\n\nA method call exists to find all inner classes. Use it instead of\nmanually enumerating the possibilities and checking.\n\nAlso fix a typo.\n\nChange-Id: I2af678e92ea0c11b53617b247d8cda324391c185\n" }, { "commit": "3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992", "tree": "e33a2f911946ebdf35e9a94e77e1062e581b6c3c", "parents": [ "a4ac253bc36bbced5acad8a7ddf1838b11f6e44c", "96496e2d17607a8bfa944461c2458b0dcdeee872" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Tue Jun 30 22:17:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 30 22:17:55 2015 +0000" }, "message": "am 96496e2d: Merge \"Build fix after changing IWindowSession.\" into cw-d-mr1-dev\n\n* commit \u002796496e2d17607a8bfa944461c2458b0dcdeee872\u0027:\n Build fix after changing IWindowSession.\n" }, { "commit": "7e3b61e73d6971c35acfa0798eb4d8da412ec3af", "tree": "28d7148b50a53bd0cf5fa8c5a3d94c8f900966ce", "parents": [ "0ec1328f85a08a610868856c688ebb8196c79c17" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Tue Jun 30 14:42:21 2015 -0700" }, "committer": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Tue Jun 30 14:42:21 2015 -0700" }, "message": "Build fix after changing IWindowSession.\n\nChange-Id: I339fecb0138e8b8907fc53372b694021f6327260\n" }, { "commit": "5d1eaf4a197130f561b16c4ed083cf016b20ab92", "tree": "2ddfee0d83c07d1db673602572287277dcc62b7e", "parents": [ "810d5ed23b89265946d7f0fd8b2e6002038f1f2c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jun 30 14:28:58 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jun 30 14:28:58 2015 -0700" }, "message": "Add missing resolveResValue call.\n\nBug: http://b.android.com/178504\nChange-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd\n" }, { "commit": "729ffa299ca786eb21ba8330096b33c7bcd66fbf", "tree": "bf35ea09eed7ca09f4194fa1980d29ae21e76257", "parents": [ "e42441a232ae1a75cdd2541f974ed8da258b97cd" ], "author": { "name": "Igor Viarheichyk", "email": "viarheichyk@google.com", "time": "Thu May 14 18:47:00 2015 -0700" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jun 25 09:49:43 2015 +0100" }, "message": "ICU format support for pseudolocalizes.\n\nCustom parser can handle nested ICU messages even if they\nare split into multiple fragments. Code reworked to encapsulate\nall pseudolocalization logic in Pseudolocalizer and PseudoMethods\nclasses. To minimize a changelist size, some static functions\nremained. Fake BiDi pseudolocalization method is reimplemented\nto handle word boundaries correctly. Unit tests added.\n\n(cherry picked from commit cbb1e676b56677ae3585c067f29646dddffb4857)\n\nbug: 22060509\n\nChange-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00\n" }, { "commit": "c93f115486dfb3e4ec8b7b634e0297024deac5c0", "tree": "c2dac4d1af2084bcc3de1684204d3e567194dda4", "parents": [ "03709c780ae26a2b27d098782364ba722e711564", "6cc479b76e9e2e8858434302e1ef2d514ed1b0ec" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jun 18 17:29:29 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 18 17:29:31 2015 +0000" }, "message": "Merge \"AAPT2: Remove the need for specifying package name in compile phase\" into mnc-dev" }, { "commit": "a750a63d639f6936af456df904fa6b9ba941885e", "tree": "41cd79aec0dedbf162eab2749bd6dec45bb7509d", "parents": [ "f5820276635a2d3d2e3c694eddba7e6a02093a20" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 16 17:18:23 2015 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Jun 17 11:41:45 2015 -0700" }, "message": "Fix issue #21814207 and issue #21814212 (alarm manager)\n\nIssue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks.\n\nIntroduce a whole new infrastructure for providing options when\nsending broadcasts, much like ActivityOptions. There is a single\noption right now, asking the activity manager to apply a tempory\nwhitelist to each receiver of the broadcast.\n\nIssue #21814212: Need to allow configuration of alarm manager parameters\n\nThe various alarm manager timing configurations are not modifiable\nthrough settings, much like DeviceIdleController. Also did a few\ntweaks in the existing DeviceIdleController impl.\n\nChange-Id: Ifd01013185acc4de668617b1e46e78e30ebed041\n" }, { "commit": "898be8bc76c873cf885d7bdf293b4f58563a1648", "tree": "d020d24de6908d1d6aad467c1627ba462c1ac6b5", "parents": [ "dc929e28acd32f7adebdc0d5afd3dc7eaa1a09fe", "fa794eb0025dbec6c1b90135495081d42f06bdaf" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 15:48:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 15:48:29 2015 +0000" }, "message": "am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge \"Fix for shadows on theme editor\" into lmp-mr1-dev\n\n* commit \u0027fa794eb0025dbec6c1b90135495081d42f06bdaf\u0027:\n Fix for shadows on theme editor\n" }, { "commit": "dc929e28acd32f7adebdc0d5afd3dc7eaa1a09fe", "tree": "d4be8a99e16f830881cf17d87869e97a025002a6", "parents": [ "d2161615988725fd49791d67a534bccdee3957cd", "40a216d95973bb897ee0d755ef260a616f176798" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 15:48:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 15:48:24 2015 +0000" }, "message": "am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge \"Fix GcSnapshot drawInLayer when clipping is used.\" into lmp-mr1-dev\n\n* commit \u002740a216d95973bb897ee0d755ef260a616f176798\u0027:\n Fix GcSnapshot drawInLayer when clipping is used.\n" }, { "commit": "b39e85afb160997a51df1dff18e118266c692243", "tree": "d97b1a9205e19ccc5329697f89762e5f102a9751", "parents": [ "c03fa1ee54424b0c8b9ecdc06004c9dbdf4925f2", "ce5a79dacfb152317429cb69c28fe8bb39c02f4c" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 15:47:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 15:47:44 2015 +0000" }, "message": "am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge \"New custom widgets library\" into lmp-mr1-dev\n\n* commit \u0027ce5a79dacfb152317429cb69c28fe8bb39c02f4c\u0027:\n New custom widgets library\n" }, { "commit": "8df6d037be43bdf98af011d0188e06a21b033aab", "tree": "00a81f427e8b09c7ea90e377110692dd64b229c5", "parents": [ "6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a", "5a53816b0da74f2f7ca302fc7361e7f105ac6bb6" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 16:17:08 2015 +0100" }, "committer": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 16:17:08 2015 +0100" }, "message": "resolved conflicts for merge of 5a53816b to mnc-dev\n\nChange-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f\n" }, { "commit": "fa794eb0025dbec6c1b90135495081d42f06bdaf", "tree": "b4d06dbd15806c14a6559435a931ed4ddbe14bed", "parents": [ "40a216d95973bb897ee0d755ef260a616f176798", "2f7103565cf1732d6d1281195cfa49a1564751d7" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 10:14:30 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 10:14:30 2015 +0000" }, "message": "am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge \"Fix for shadows on theme editor\" into lmp-mr1-dev\n\n* commit \u00272f7103565cf1732d6d1281195cfa49a1564751d7\u0027:\n Fix for shadows on theme editor\n" }, { "commit": "40a216d95973bb897ee0d755ef260a616f176798", "tree": "9577cf9b4f19ce9848580fe25ac065be400502ff", "parents": [ "c6d3342064db4982298d0ebe79c8b974c57b99a7", "df6f63badfe2572284dad8e34f152fd1c24a873e" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 10:14:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 10:14:24 2015 +0000" }, "message": "am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge \"Fix GcSnapshot drawInLayer when clipping is used.\" into lmp-mr1-dev\n\n* commit \u0027df6f63badfe2572284dad8e34f152fd1c24a873e\u0027:\n Fix GcSnapshot drawInLayer when clipping is used.\n" }, { "commit": "2f7103565cf1732d6d1281195cfa49a1564751d7", "tree": "ccd0a1d826e7d228b52488d32e4dd895734024eb", "parents": [ "df6f63badfe2572284dad8e34f152fd1c24a873e", "13c06d6c91e67962b7ffdf92c56e3b01125e4a8d" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 10:04:02 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 10:04:02 2015 +0000" }, "message": "am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge \"Fix for shadows on theme editor\" into lmp-mr1-dev\n\n* commit \u002713c06d6c91e67962b7ffdf92c56e3b01125e4a8d\u0027:\n Fix for shadows on theme editor\n" }, { "commit": "df6f63badfe2572284dad8e34f152fd1c24a873e", "tree": "2be5bd8500e8ae8d212cd22a613e84b48d70918c", "parents": [ "d717682df97e812d4a25f93b0c9e84548767d8e1", "2422011d867f4d4516605148641bbeb7d9c2501b" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 10:03:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 10:03:58 2015 +0000" }, "message": "am 2422011d: am b2411c62: am ead59b0d: Merge \"Fix GcSnapshot drawInLayer when clipping is used.\" into lmp-mr1-dev\n\n* commit \u00272422011d867f4d4516605148641bbeb7d9c2501b\u0027:\n Fix GcSnapshot drawInLayer when clipping is used.\n" }, { "commit": "13c06d6c91e67962b7ffdf92c56e3b01125e4a8d", "tree": "182ce023d15eb578c4082cdd7b0779fbb8a11f21", "parents": [ "2422011d867f4d4516605148641bbeb7d9c2501b", "1f33bdad98dd5138f887642d39c9495e1d7df14b" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 09:50:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 09:50:58 2015 +0000" }, "message": "am 1f33bdad: am 5e50e00c: Merge \"Fix for shadows on theme editor\" into lmp-mr1-dev\n\n* commit \u00271f33bdad98dd5138f887642d39c9495e1d7df14b\u0027:\n Fix for shadows on theme editor\n" }, { "commit": "2422011d867f4d4516605148641bbeb7d9c2501b", "tree": "632189b7d4f93298e2bd7661953b9ae6ddf5ecfe", "parents": [ "5c597c1d89c529675096c2d326c452145403979d", "b2411c622cf9124f6af5f70d416adb179f9c88bb" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 09:50:51 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 15 09:50:51 2015 +0000" }, "message": "am b2411c62: am ead59b0d: Merge \"Fix GcSnapshot drawInLayer when clipping is used.\" into lmp-mr1-dev\n\n* commit \u0027b2411c622cf9124f6af5f70d416adb179f9c88bb\u0027:\n Fix GcSnapshot drawInLayer when clipping is used.\n" }, { "commit": "5e50e00c663a5d0b11d1f41509e1fb4e56d166f1", "tree": "7685132c51fb13779d4bfbff689647908d19a98c", "parents": [ "ead59b0d479c3a911be87261b523255e8e51f76a", "e5be1d7a397db08a4dd75c66bdbbc6e2b61baaa8" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 08:34:56 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 15 08:35:00 2015 +0000" }, "message": "Merge \"Fix for shadows on theme editor\" into lmp-mr1-dev" }, { "commit": "ead59b0d479c3a911be87261b523255e8e51f76a", "tree": "74a7c652a4ef2f10e9bf3ee959ef20f3a9f55ff1", "parents": [ "ce4a9d9110436a2ea825976af7895c58303a3dac", "8ab069f3aed15c7e5de32ff52a3b4710218f9895" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Mon Jun 15 08:34:01 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 15 08:34:04 2015 +0000" }, "message": "Merge \"Fix GcSnapshot drawInLayer when clipping is used.\" into lmp-mr1-dev" }, { "commit": "6cc479b76e9e2e8858434302e1ef2d514ed1b0ec", "tree": "3bc2ca1ed297786809dac34b9e0c067586636d8b", "parents": [ "6cb8e30bb7e79cb694bf44d185da201e9deb9363" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jun 12 15:45:48 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jun 12 17:12:04 2015 -0700" }, "message": "AAPT2: Remove the need for specifying package name in compile phase\n\nThe compile phase doesn\u0027t use the AndroidManifest, so we had to specify the\npackage name on the command line.\n\nWe can omit the package name, since we don\u0027t resolve external references\nin the compile phase. Packages that reference the current package will be encoded\nwith no package name. When loaded by the link phase, the package name will be supplied\nand all the references with no package name will use that one.\n\nChange-Id: I9fe4902b747b06899b45c968f30ba1aa05c5cd69\n" }, { "commit": "ce5a79dacfb152317429cb69c28fe8bb39c02f4c", "tree": "a7222496e3382faed16215772e079f02ac3ffdef", "parents": [ "5a53816b0da74f2f7ca302fc7361e7f105ac6bb6", "d717682df97e812d4a25f93b0c9e84548767d8e1" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Fri Jun 12 16:29:59 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 12 16:29:59 2015 +0000" }, "message": "am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge \"New custom widgets library\" into lmp-mr1-dev\n\n* commit \u0027d717682df97e812d4a25f93b0c9e84548767d8e1\u0027:\n New custom widgets library\n" }, { "commit": "5a53816b0da74f2f7ca302fc7361e7f105ac6bb6", "tree": "6c7c3978beed16c27723eacb3aa4686564207eca", "parents": [ "a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20", "c051c556669f88e284f2922f8d28fad2138598ae" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Fri Jun 12 16:29:54 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 12 16:29:54 2015 +0000" }, "message": "am c051c556: am e10e8005: am 68155986: am f5a99437: Merge \"Fix crash when shadowSize is 0\" into lmp-mr1-dev\n\n* commit \u0027c051c556669f88e284f2922f8d28fad2138598ae\u0027:\n Fix crash when shadowSize is 0\n" }, { "commit": "d717682df97e812d4a25f93b0c9e84548767d8e1", "tree": "db11eab60087679656a131afa571087bbccc4ec0", "parents": [ "c051c556669f88e284f2922f8d28fad2138598ae", "5c597c1d89c529675096c2d326c452145403979d" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Fri Jun 12 15:10:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 12 15:10:18 2015 +0000" }, "message": "am 5c597c1d: am a8854564: am ce4a9d91: Merge \"New custom widgets library\" into lmp-mr1-dev\n\n* commit \u00275c597c1d89c529675096c2d326c452145403979d\u0027:\n New custom widgets library\n" }, { "commit": "c051c556669f88e284f2922f8d28fad2138598ae", "tree": "ac71f231ec0bf71c1dc19544e5fc0c62e2e3a7f5", "parents": [ "327b481f1f2499eaa5ab938e63a2c12c21fe7482", "e10e8005903572158cbb9c7f869508a247ff51ad" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Fri Jun 12 15:10:14 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 12 15:10:14 2015 +0000" }, "message": "am e10e8005: am 68155986: am f5a99437: Merge \"Fix crash when shadowSize is 0\" into lmp-mr1-dev\n\n* commit \u0027e10e8005903572158cbb9c7f869508a247ff51ad\u0027:\n Fix crash when shadowSize is 0\n" }, { "commit": "5c597c1d89c529675096c2d326c452145403979d", "tree": "c4d9151cd67fc422dce1b8ca29d8ba806689e29e", "parents": [ "e10e8005903572158cbb9c7f869508a247ff51ad", "a885456426ec267d37c6a527285d965f81e14f9d" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Fri Jun 12 14:57:35 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 12 14:57:35 2015 +0000" }, "message": "am a8854564: am ce4a9d91: Merge \"New custom widgets library\" into lmp-mr1-dev\n\n* commit \u0027a885456426ec267d37c6a527285d965f81e14f9d\u0027:\n New custom widgets library\n" }, { "commit": "e10e8005903572158cbb9c7f869508a247ff51ad", "tree": "b6beeb5a41647bafaf97f2a320bf2f849e6d2ed7", "parents": [ "786cd12f785374f93c19c909687ea300e41ffbc2", "68155986508ef8b497228f8e60346d317e87991d" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Fri Jun 12 14:57:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 12 14:57:27 2015 +0000" }, "message": "am 68155986: am f5a99437: Merge \"Fix crash when shadowSize is 0\" into lmp-mr1-dev\n\n* commit \u002768155986508ef8b497228f8e60346d317e87991d\u0027:\n Fix crash when shadowSize is 0\n" }, { "commit": "ce4a9d9110436a2ea825976af7895c58303a3dac", "tree": "6cd68743652c5a84cf0a1c6b056741174e4110b7", "parents": [ "f5a99437bf203eca49e8ab8f74f2c206c551289b", "aa3b2043f0403d064afcf0977f6e713662aceaff" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Fri Jun 12 14:34:48 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 12 14:34:50 2015 +0000" }, "message": "Merge \"New custom widgets library\" into lmp-mr1-dev" }, { "commit": "3f6bd481c21430d7e9b396fce09ea25bc6a99905", "tree": "f3e0ecf87abfdebe4fd0f38c027575cc66929e27", "parents": [ "1c83a0430fc36e59ee736021c54a35587981030a", "4dfe4d43ce5634f059a3ba669e3cac4551c3a3ee" ], "author": { "name": "Jens Ole Lauridsen", "email": "jlauridsen@google.com", "time": "Fri Jun 12 04:48:48 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 12 04:48:51 2015 +0000" }, "message": "Merge \"Support AppBar from Material Design.\" into mnc-dev" }, { "commit": "e97c9a244b71b6376003c377b56f7a86bcd0049f", "tree": "ef05b29509c0872d9f34b9db972d12ef4caad6a5", "parents": [ "4039f6570cff0013d3986b522d43e6eab7cc28a6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Jun 10 22:12:54 2015 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Jun 11 18:53:14 2015 -0700" }, "message": "Configure auto-rotation tilt tolerance in config.xml.\n\nThis allows for the thresholds to be tuned differently for different\nproducts as needed.\n\nBug: 18276856\nChange-Id: I6c87e683dea6a17cf606203a894c8419e20d3658\n" }, { "commit": "4dfe4d43ce5634f059a3ba669e3cac4551c3a3ee", "tree": "285265d514a37da67bb3a93a1eaba5d783bae875", "parents": [ "8a26514687ccf651eb73d5acdd3ae7c62d247d97" ], "author": { "name": "Jens Ole Lauridsen", "email": "jlauridsen@google.com", "time": "Fri Jun 05 08:04:27 2015 -0700" }, "committer": { "name": "Jens Ole Lauridsen", "email": "jlauridsen@google.com", "time": "Thu Jun 11 13:50:22 2015 -0700" }, "message": "Support AppBar from Material Design.\n\nThis CL is a start for making the design able to render the AppBar.\nWe are still missing support for: system menu and the app icon.\n\nChange-Id: I19600f8ee1e7e6492186a0b7ae7fb38c82e15c02\n" }, { "commit": "a1ad4a812a87642ad259ff4478159e8cc8194680", "tree": "eff82221ed22a3be824ddf40823b2db3af002fb1", "parents": [ "b5766468538de200d26012d96019db26bccac5d4" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jun 08 11:41:09 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jun 09 11:14:24 2015 -0700" }, "message": "AAPT2: Proguard rules generation added.\n\nChange-Id: Ifbe79516cd9a1ade471e211a259301c63b62ac67\n" }, { "commit": "8c831ca87bb7c8699b2a5cb34b8d35deedf9ce4e", "tree": "454f5342f3634e3cb2ea858fcf6226ec3b133911", "parents": [ "581cc1ee59d01fe4b4a31618ab4aedfa639e42b0" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed May 20 15:24:01 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jun 04 18:00:33 2015 -0700" }, "message": "AAPT2: Add manifest merging\n\nNow that AAPT2 is library-aware, it needs to take care of\nall library related work, including merging manifests.\nThe logic was taken from the current Java ManifestMerger.\n\nChange-Id: Id93f713f27ae8617922bf89e325e45be9f863c06\n" }, { "commit": "581cc1ee59d01fe4b4a31618ab4aedfa639e42b0", "tree": "6573e4b4b46037ed80378146c8698b247aad26c3", "parents": [ "2b710c29e2ae7808bbd1a1a6d0c39f69ad8bf33a", "75f3a55cc569a9b61f540a85d9828e91bdca5047" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jun 04 19:40:32 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 04 19:40:34 2015 +0000" }, "message": "Merge \"AAPT2: Change xml file parsing to DOM based\" into mnc-dev" }, { "commit": "75f3a55cc569a9b61f540a85d9828e91bdca5047", "tree": "1055d807109f55e29da595938348d87b6ea43326", "parents": [ "4573dddcce3f232d2eeb20bfe0e204e15a9416e9" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 03 14:54:23 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jun 04 11:37:05 2015 -0700" }, "message": "AAPT2: Change xml file parsing to DOM based\n\nWe modify the XML of layouts and AndroidManifest enough\nthat it warrants we operate on the tree in memory.\nThese files are never very large so this should be fine.\n\nChange-Id: I5d597abdb3fca2a203cf7c0b40fcd926aecb3137\n" }, { "commit": "1ea14d6696dafce9b7487eb850346a124a9c977c", "tree": "ba6256c6fe3b49b20299dbe5d1fb5e2b25edacc9", "parents": [ "da3f63ffb87397943546a7c5c893ce98f2489df2", "5892248580859620db90d5ef2e3c2f48531933fa" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Jun 02 19:52:31 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 02 19:52:32 2015 +0000" }, "message": "Merge \"aapt: add option for stricter symbol generation\" into mnc-dev" }, { "commit": "e5be1d7a397db08a4dd75c66bdbbc6e2b61baaa8", "tree": "89362c89c41828a31c8f885f8f0c145ebcd1c7a3", "parents": [ "958a7c1cd816986ac58073ae415b0825c0a11b7b" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Tue Jun 02 11:14:53 2015 +0100" }, "committer": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Tue Jun 02 11:14:53 2015 +0100" }, "message": "Fix for shadows on theme editor\n\nIf the preferred ColorModel doesn\u0027t support alpha, the shadows are\nincorrectly rendered. In the theme editor on Linux, the graphics device\nobject doesn\u0027t support alpha so we need to use a different color model.\nWe default to ARGB which works fine.\n\nChange-Id: I3e71e3d086fa4975a9149d36792e574813f37dfd\n" }, { "commit": "5892248580859620db90d5ef2e3c2f48531933fa", "tree": "1aa8d618ee303c56fba94e636d53f46db6e221c9", "parents": [ "8a8ffd4e9b15a04d2af0909205658f08c76bd6b2" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Jun 01 17:59:41 2015 -0700" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Jun 02 02:55:52 2015 +0000" }, "message": "aapt: add option for stricter symbol generation\n\nAdds an option that prevents generating java symbols for string\nresources that don\u0027t have a default localization.\n\nBug: 21537397\nChange-Id: Ifafa942b24d5cdbed93651cde363e859be13d395\n" }, { "commit": "86caef1892e1ce063e0e880396c8deaa3a6a171d", "tree": "adf59c1fe3baf13444cbf6f48e37e9d0d0e3df48", "parents": [ "b3e872be9e634c8d1f34d07778ea753880bbf2d9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jun 01 14:21:24 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jun 01 14:43:28 2015 -0700" }, "message": "LayoutLib: Skip classes from java package.\n\nClasses in \"java\" package can\u0027t be defined at runtime anyway. No use\nincluding them in LayoutLib.\n\nChange-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73\n" }, { "commit": "b3e872be9e634c8d1f34d07778ea753880bbf2d9", "tree": "9f6cbbe9b567142cf4c725e5bbe398c9eda7eef8", "parents": [ "88fb14532421f049614c34120c706c26a9af6bbd" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 27 12:35:56 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jun 01 14:41:38 2015 -0700" }, "message": "Skip warnings for some unresolved references.\n\nSome applications rename the newer RTL attributes to the older\nattributes in order to target RTL locales, but not need to include two\nattributes everywhere it\u0027s needed. For example, iosched renames\npaddingStart to paddingLeft (among other attributes) for API 17 and\nabove. This leads to hundreds of warnings about missing attributes.\nThis change suppresses such warnings.\n\nAlso, skip adding unresolved attributes to the typed array. This is more\nin line with the actual implementation on device, and prevents\nunexpected warnings/errors/crashes later.\n\nChange-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20\n" }, { "commit": "8825de1751b4362d3a6fce2e402c51e481bb2729", "tree": "cf2837c355b970da23047a8d7a8ea9bf161f9a38", "parents": [ "b305410962eba135605c87ed246b2d7051d4e86a", "919f93265de94156d2cb32b598b5e08aa8da27c3" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Mon Jun 01 16:07:47 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 01 16:07:48 2015 +0000" }, "message": "Merge \"Revert \"Revert \"Fix build.\"\"\" into mnc-dev" }, { "commit": "919f93265de94156d2cb32b598b5e08aa8da27c3", "tree": "0cf7c3f50728636335a8a1cb997fbe86383e2b0c", "parents": [ "944a6c937cd3576ecae5c3fdd0dcf265329e6bcf" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Mon Jun 01 16:07:36 2015 +0000" }, "committer": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Mon Jun 01 16:07:36 2015 +0000" }, "message": "Revert \"Revert \"Fix build.\"\"\n\nThis reverts commit 944a6c937cd3576ecae5c3fdd0dcf265329e6bcf.\n\nChange-Id: I7daa255f331a1e39308eb626580aa00c63c5cb3e\n" }, { "commit": "99bcc3eee23ed8bd15bd108d068d6f9f694e4393", "tree": "7264c5e939601112f2fc17ca02aea96e4bbe1d1d", "parents": [ "c4e5ec3f7fcc99de6aa070d463bfaeedbfd86802", "2217f61e51ba4b19c56b19297c1e9cf74d7d860f" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Mon Jun 01 15:42:40 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 01 15:42:42 2015 +0000" }, "message": "Merge \"Revert \"Revert \"resolved conflicts for merge of 47249f2a to mnc-dev\"\"\" into mnc-dev" }, { "commit": "996458b76c944f78eee26d7bd8cb4d39303b9119", "tree": "ed27e6e451ec9ee0ce702f8ec14f9f8cd782cc60", "parents": [ "e14e97a32cf94c70f8555019d4df6753e4d43611" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 29 17:00:34 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat May 30 01:25:34 2015 +0000" }, "message": "Fix ParserFactory not initialized error.\n\nBug: http://b.android.com/175129\nChange-Id: I2111673767e0f62ee910560022b559a177d55abd\n" }, { "commit": "d758e042ce08c46712db3db2d63fc84795028dfe", "tree": "49028b347d709e286ecae9198e01039c60861d77", "parents": [ "5779ad71eabed3aabaefef1e4749693f8320816e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 28 12:33:04 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 28 14:57:43 2015 -0700" }, "message": "Fix NPE in BridgeContext.obtainStyledAttributes()\n\nReplace direct member access with getter that checks for nullness.\n\nChange-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586\n" }, { "commit": "5779ad71eabed3aabaefef1e4749693f8320816e", "tree": "1dfc6f69a4b42b49b18fd266ff0ae372c92992cc", "parents": [ "bcbe9ba0f939803dfa9b48519e113dc1c32268dc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 27 16:57:10 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 28 14:57:43 2015 -0700" }, "message": "Fix BridgeTypedArray.getType()\n\nAlso includes some fixes for BridgeTypedArray.getInt() - when value is a\ncolor, when value is an octal int, when value is true/false.\n\nBug: http://b.android.com/162438\nChange-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6\n" }, { "commit": "2217f61e51ba4b19c56b19297c1e9cf74d7d860f", "tree": "8e6794696b4517c2cc7304b2c4358dea2296fa07", "parents": [ "b2849d9a20ac080c1b29a3b54a1d636080faccc3" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Tue May 26 11:32:08 2015 -0700" }, "committer": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed May 27 15:36:10 2015 -0700" }, "message": "Revert \"Revert \"resolved conflicts for merge of 47249f2a to mnc-dev\"\"\n\nThis includes the fix for the broken dialog windows. The outsets will\nonly be calculated and applied if the window is full screen, since\nthey don\u0027t make much sense otherwise.\n\nThis reverts commit 4bb6b751fbbb218e8a298db4aa008472a0aa8d31.\n\nChange-Id: I977a85a78c990c1840784dc0be0dddd5a6d84e6b\n" }, { "commit": "bcbe9ba0f939803dfa9b48519e113dc1c32268dc", "tree": "00b3c7c217ae64f065db1081e78b60509bbbb30c", "parents": [ "a268ae5f51b8b4697aeb337a7d0700ed6e281f66", "59164ec0551aa49f497acca81222f304cf4f344b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 26 22:37:26 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 26 22:37:27 2015 +0000" }, "message": "Merge \"Include Shapes in LayoutLib.\" into mnc-dev" }, { "commit": "a268ae5f51b8b4697aeb337a7d0700ed6e281f66", "tree": "5712dfd6d8fe3708c8b487a2a220b8d1ae13fcfa", "parents": [ "c801e91528705145bd403333e69ee7c01eb63d35", "642cff50f8f7a67eed09eac1e56d7133b26a192c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 26 22:37:09 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 26 22:37:09 2015 +0000" }, "message": "Merge \"LayoutLib: Support getting resource arrays.\" into mnc-dev" }, { "commit": "c801e91528705145bd403333e69ee7c01eb63d35", "tree": "56d59a57e9c3d7a769e865775f6da6112ba2056c", "parents": [ "9123e666bb1a54b466c678400c344c1bb3a266f9", "476e582d2ffdf25102d4c55f8c242baa3d21d37f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 26 22:36:28 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 26 22:36:29 2015 +0000" }, "message": "Merge \"LayoutLib: Change nullity annotations.\" into mnc-dev" }, { "commit": "642cff50f8f7a67eed09eac1e56d7133b26a192c", "tree": "cdf166b9e1e634d7621bc8dedf2cef299ba5b167", "parents": [ "476e582d2ffdf25102d4c55f8c242baa3d21d37f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 22 15:47:16 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 26 16:33:10 2015 +0000" }, "message": "LayoutLib: Support getting resource arrays.\n\n- Don\u0027t crash when Resources.get\u003cType\u003eArray() is called.\n- If the IDE supports it, actually return the value.\n- Add tests for getArray.\n- Update test app to latest gradle plugin version.\n- Switch to using AppTheme for tests, since the tests depend on some\n custom theme attributes. The AppTheme now inherits from\n Material.Light.DarkActionBar, so other tests should be unaffected.\n\nDepends on a newer version of sdk-common, which fixes the parsing of\narray resource in value files.\n\nBug: 12372031\nChange-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d\n" }, { "commit": "59164ec0551aa49f497acca81222f304cf4f344b", "tree": "86aed79c719ad5481dfcb813717effe0ce633132", "parents": [ "327c364113c18c9d5a05df0c912b65788461da41" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 26 09:24:48 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 26 16:28:53 2015 +0000" }, "message": "Include Shapes in LayoutLib.\n\nChange-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08\n" }, { "commit": "d0acf0627aa5f78cbf5bb189c7097546b86abebc", "tree": "930e4f747c7fff473b70321dfdd83c0444dcc273", "parents": [ "ed77bc09879784a56c60f215f267adc100213ed2", "944a6c937cd3576ecae5c3fdd0dcf265329e6bcf" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat May 23 01:21:09 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 23 01:21:11 2015 +0000" }, "message": "Merge \"Revert \"Fix build.\"\" into mnc-dev" }, { "commit": "944a6c937cd3576ecae5c3fdd0dcf265329e6bcf", "tree": "8b1cc927dfd62b8b5e0420a9f0547f375555f7a4", "parents": [ "97b3ae1a8766616675ebf2323a97d8adfd41bfdc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat May 23 01:19:23 2015 +0000" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat May 23 01:20:53 2015 +0000" }, "message": "Revert \"Fix build.\"\n\nThis reverts commit 97b3ae1a8766616675ebf2323a97d8adfd41bfdc.\n\nReverted since 4bb6b751fbbb218e8a298db4aa008472a0aa8d31 reverts\nthe commit that warranted this change.\n\nChange-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f\n" }, { "commit": "476e582d2ffdf25102d4c55f8c242baa3d21d37f", "tree": "55697be085d321b979f833996cb8c9cee9a4afc5", "parents": [ "dd5ee4b89083ec9b50b8c9739274136b0c74abb5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 22 14:11:22 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 22 17:57:29 2015 -0700" }, "message": "LayoutLib: Change nullity annotations.\n\nSwitch from using tools nullity annotations (com.android.annotations)\nto android framework annotations (android.annotation).\n\nA new sdk-common prebuilt is required for LayoutLib tests. The new\nsdk-common requires an updated tools-common. The updated tools-common\ndoesn\u0027t have nullity annotations. So, instead of adding the annotation\ndependency, just reuse the platform ones. This also paves the way to\ninclude other platform annotations like IdRes etc.\n\nChange-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7\n" }, { "commit": "4bb6b751fbbb218e8a298db4aa008472a0aa8d31", "tree": "ba7bccf0a758da93655db357c6fe5a8f60f8e90b", "parents": [ "4cb03fa059d0145e81e624fddc4b57cb471bd786" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 22 16:34:44 2015 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 22 16:34:44 2015 -0700" }, "message": "Revert \"resolved conflicts for merge of 47249f2a to mnc-dev\"\n\nThis reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing\nchanges made to 8562b08f04c1309cf40db1e749d612b6824f1d12.\n" }, { "commit": "97b3ae1a8766616675ebf2323a97d8adfd41bfdc", "tree": "0cf7c3f50728636335a8a1cb997fbe86383e2b0c", "parents": [ "361b2d69eef8cb19994a17fb317b7b84ea5b0b95" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed May 20 19:40:27 2015 -0700" }, "committer": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Fri May 22 01:42:32 2015 +0000" }, "message": "Fix build.\n\nCherry picking because automerger is stuck.\n\nChange-Id: I49f669ee8eed53cf2fc30077cf0a066312865733\n(cherry picked from commit c1b736a0cdf41ab5863bfe6901e46c95cc396342)\n" }, { "commit": "91e5b0f598f19499e55dcb8f0243b430e3c1ee4f", "tree": "de7adfc416faffc9c0c02e504f2ca62917a140e1", "parents": [ "e4b47614b7f07dedabe316b5263ec37249ce9c15", "c7becb7ee78881646251ff4846e63eb6b96bf7ec" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Fri May 22 00:02:47 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 22 00:02:48 2015 +0000" }, "message": "Merge \"resolved conflicts for merge of 47249f2a to mnc-dev\" into mnc-dev" }, { "commit": "a5e6298b35fa212a7f20740174c553ce4079cce2", "tree": "2f3ee6a87b9a003d15fed97c3ecb9fe1c2963ce9", "parents": [ "769832d11163abaa8a355650e796c2e39d7e0f3d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 21 16:03:24 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 21 23:07:15 2015 +0000" }, "message": "Add LayoutLibDelegate for new Bitmap method.\n\nOriginal method added in: 721ae5fec5f1fd4f93aa2a361a0ac298e15ce353\n\nChange-Id: Ie14d132459638cf103c390fae3f4c0c02bef2f34\n" }, { "commit": "6330971ed293a2777bbdab09288f90ea4b2d0255", "tree": "9611d117a92e2d26fa79ea41a2ac7ca2126330a7", "parents": [ "f98702eae04e239670e8b882d53c974d4b56e291" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 21 11:47:36 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 21 18:51:13 2015 +0000" }, "message": "Add documentation about hack in commit: f8ea750455\n\nChange-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b\n" }, { "commit": "c7becb7ee78881646251ff4846e63eb6b96bf7ec", "tree": "a42141a24ea950f26b21faf95157f8f2513f66d3", "parents": [ "8562b08f04c1309cf40db1e749d612b6824f1d12", "47249f2a9e49aa9626369517315eafc6b42fd8e9" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed May 20 20:11:39 2015 -0700" }, "committer": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed May 20 20:15:29 2015 -0700" }, "message": "resolved conflicts for merge of 47249f2a to mnc-dev\n\nThis is a merge of chin support.\n\nChange-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635\n" }, { "commit": "479b1c77ce7b033f7160614f5a0d7305d1268129", "tree": "591bd1391d3c6afdcc3d12a8aed92d48350aec7d", "parents": [ "47249f2a9e49aa9626369517315eafc6b42fd8e9", "037c9caccdc98bfe9d952e797535611c791787aa" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Thu May 21 02:55:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 21 02:55:33 2015 +0000" }, "message": "am 037c9cac: Merge \"Fix build.\" into cw-d-mr1-dev\n\n* commit \u0027037c9caccdc98bfe9d952e797535611c791787aa\u0027:\n Fix build.\n" }, { "commit": "037c9caccdc98bfe9d952e797535611c791787aa", "tree": "8e039977812c633bbfe7c2992bb6a999ea75fc97", "parents": [ "cb89ac84c621e047d81873428325dfd747b90a6b", "c1b736a0cdf41ab5863bfe6901e46c95cc396342" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Thu May 21 02:41:06 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 21 02:41:08 2015 +0000" }, "message": "Merge \"Fix build.\" into cw-d-mr1-dev" }, { "commit": "c1b736a0cdf41ab5863bfe6901e46c95cc396342", "tree": "d908351e949a82514e1a80ed3b7b1959a6103fe3", "parents": [ "627f26817f752e0e1beb4185e778edc4501b4aa6" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed May 20 19:40:27 2015 -0700" }, "committer": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed May 20 19:40:27 2015 -0700" }, "message": "Fix build.\n\nChange-Id: I49f669ee8eed53cf2fc30077cf0a066312865733\n" }, { "commit": "4d8e078c7c9c9f8407ebc7e88673e53b67723e18", "tree": "84a06f7e7099c7da2053f42e1dc9cfc4f0d228f6", "parents": [ "d5b82845450beac2d3c7db9cd80e9fc34d43a297" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 18:25:58 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 18:49:56 2015 -0700" }, "message": "Fix overrides for BridgeResources.\n\nNew method overloads have been introduces in android.content.Resources.\nChange BridgeResources to overrides the appropriate ones. Also, fix the\nimplementation to the new behaviour.\n\nChange-Id: I7b83b329f04286512f223c0fafc3f989f1b9a244\n" }, { "commit": "d5b82845450beac2d3c7db9cd80e9fc34d43a297", "tree": "f3298fd893d2383f6297b77a12741dd192c968da", "parents": [ "10dff451f3998728f4bb54585e4c5402edca06ba" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 18:01:48 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 18:01:48 2015 -0700" }, "message": "Make DatePicker rendering not fail.\n\nEnsures that having a DatePicker in the layout doesn\u0027t crash the\ncomplete rendering. The rendering is still not perfect, but at least it\nworks.\n\n- Return a non-null window token so that ViewPager thinks that it\u0027s\n attached to a window and doesn\u0027t skip populating the views.\n- Fix a style not found issue.\n\nChange-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9\n" }, { "commit": "10dff451f3998728f4bb54585e4c5402edca06ba", "tree": "84361329341e9e93438f92d700c7719a78ccf5fb", "parents": [ "719c9b93f1f1b0a42addceb99484879b4ba10d50" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 16:49:42 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 16:51:22 2015 -0700" }, "message": "Use non deprecated method for creating ColorStateList\n\nChange-Id: I9fce928276c8a2af55eb0615a4895abb6a973be5\n" }, { "commit": "719c9b93f1f1b0a42addceb99484879b4ba10d50", "tree": "d5e10cd557097584224ad66cf5cc6debb1b5e1ce", "parents": [ "f2049a4fcbe3775493636054b7597edfabc88342" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 16:47:06 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 16:51:22 2015 -0700" }, "message": "Fix line breaking.\n\nEssentially moves line breaking measurement later in the process when\ncharacter widths have already been computed.\n\nChange-Id: I17c5bc10d373d8906c5caf86604ce8504650cd7f\n" }, { "commit": "f2049a4fcbe3775493636054b7597edfabc88342", "tree": "2e1e8cf7ce82b844dfb11f48c27e6091f42fbc6a", "parents": [ "d45867a498db7a874ea40c5ec41861b0886fc3c9", "bfc9c3bcbe3b7056d3330f754811c1506f181b88" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 23:32:03 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 20 23:32:04 2015 +0000" }, "message": "Merge \"Inject anonymous inner classes of injected classes\" into mnc-dev" }, { "commit": "bfc9c3bcbe3b7056d3330f754811c1506f181b88", "tree": "37850cf7b4ee68bb02b2b1d5f4abc64692b1009d", "parents": [ "612a05e7e15184b21437731b9aa5db2d1d4fc54c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 14:51:37 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 23:31:31 2015 +0000" }, "message": "Inject anonymous inner classes of injected classes\n\nWhen injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib\ncan refer back to the changes, also inject the anonymous inner classes.\nWithout this, the injected classes are not loadable. Although, LayoutLib\nitself doesn\u0027t load these classes, but some tests do.\n\nChange-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064\n" }, { "commit": "d45867a498db7a874ea40c5ec41861b0886fc3c9", "tree": "4c008c2c1a9b50e2afa66f18c009a37890e7161e", "parents": [ "b14b7e188fd1cc5215d2ac0c2a1c1588089712f1", "612a05e7e15184b21437731b9aa5db2d1d4fc54c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 23:30:10 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 20 23:30:14 2015 +0000" }, "message": "Merge \"Update platformDir search in tests.\" into mnc-dev" }, { "commit": "47249f2a9e49aa9626369517315eafc6b42fd8e9", "tree": "9961cf51931b0c023fe8e7585a35ee73e0850895", "parents": [ "782def772adacaf029d7d9850605923066665424", "cb89ac84c621e047d81873428325dfd747b90a6b" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed May 20 22:54:14 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 20 22:54:14 2015 +0000" }, "message": "am cb89ac84: Merge \"Support for devices with a chin.\" into cw-d-mr1-dev\n\n* commit \u0027cb89ac84c621e047d81873428325dfd747b90a6b\u0027:\n Support for devices with a chin.\n" }, { "commit": "3e11bf33a6094da92d97702213aa12c67b21c4d1", "tree": "49be3c98dde6651926268bbf36e0a90ae60c820f", "parents": [ "627f26817f752e0e1beb4185e778edc4501b4aa6" ], "author": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Mon Apr 20 08:40:57 2015 -0700" }, "committer": { "name": "Filip Gruszczynski", "email": "gruszczy@google.com", "time": "Wed May 20 14:20:30 2015 -0700" }, "message": "Support for devices with a chin.\n\nInformation about the chin is now part of the config.xml instead of the\ntheme. It is retrieved by WindowManagerService and passed to the clients\nas insets. Clients can adjust their behavior in a way that makes it\ninvisible to the user, that part of the surface doesn\u0027t actually exist.\n\nBug: 19908853\n\nChange-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f\n" }, { "commit": "612a05e7e15184b21437731b9aa5db2d1d4fc54c", "tree": "2b689eccd70f7bdedc4b0069e8b62b20e0b71e51", "parents": [ "f8ea750455eec81e4e6d877b3e18e29a86d4ec95" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 11:28:50 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 11:28:50 2015 -0700" }, "message": "Update platformDir search in tests.\n\nWhen trying to find the SDK Platform Dir for LayoutLib tests, also\ntest if the dir from which the tests are run is module dir.\n\nChange-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32\n" }, { "commit": "1c5bf7f1ddc8c9c9844a1bc1a7e4ce53dcc5d5bd", "tree": "e351522e10c82a4c3caf7b9d0f832808f434bb12", "parents": [ "f357c96273ad8c0f7acc0e15213cced2f0b21883", "f8ea750455eec81e4e6d877b3e18e29a86d4ec95" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 20 03:05:51 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 20 03:05:52 2015 +0000" }, "message": "Merge \"Make Context.getClassLoader() work.\" into mnc-dev" }, { "commit": "f8ea750455eec81e4e6d877b3e18e29a86d4ec95", "tree": "98759198fabb789eaa05ccd8c893d4dfaa64d3fc", "parents": [ "21b564573327b1ed2f7e06146b8a01c47ede3089" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 18 18:47:07 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 19 19:56:20 2015 -0700" }, "message": "Make Context.getClassLoader() work.\n\nContext.getClassLoader() is used by the LayoutInflater and can be used\nby custom views. However, when called from the LayoutInflater, this\nneeds to return only the Framework classes. This is so that the IDE gets\na chance to instantiate the custom views, which helps in better error\nreporting and better fallback in case of exceptions, like MockView.\n\nTo workaround this need of the same method returning different results\nbased on where it\u0027s called from, the method call in LayoutInflater is\nrenamed to getFrameworkClassLoader() and the new method is injected in\nContext. The implementation of getFrameworkClassLoader() maintains the\nexisting behaviour of getClassLoader().\n\nContext.getClassLoader() is now modified to return classes from both\nFramework and the app namespace.\n\nAlso, update the list of packages to search for Framework views.\n\nChange-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b\n" }, { "commit": "5deaa138443433f861a52f4cdc461a677437c416", "tree": "97b71591f86da7186ac5e318c6392d5c8bf1cc16", "parents": [ "2d9c6015b32338f1b82f46ec7ea7328422f0330a", "21b564573327b1ed2f7e06146b8a01c47ede3089" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 19 19:07:45 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 19 19:07:46 2015 +0000" }, "message": "Merge \"Fix include tag rendering.\" into mnc-dev" }, { "commit": "21b564573327b1ed2f7e06146b8a01c47ede3089", "tree": "1bb0977b230a4bbb5ac7b269c3d2ebd563c68164", "parents": [ "5f1bf496948fb6383ae17e5467a26a00489d7564" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 19 11:55:15 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 19 12:06:22 2015 -0700" }, "message": "Fix include tag rendering.\n\nA missing catch clause caused rendering to be failed when there is an\ninclude tag that doesn\u0027t specify layout_width and layout_height. Also\nimprove the error messages to make debugging easier next time.\n\nChange-Id: I617762636973a010b34da167c7b5fcd328b7d178\n" }, { "commit": "9354a3ac006001b10c3a3de59737798034794c89", "tree": "3da9025488eaede02751ace68add81800c9dbab4", "parents": [ "8783d3fe761ab943ad73e7c58252806df9e401da", "5f1bf496948fb6383ae17e5467a26a00489d7564" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 18 22:04:22 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 18 22:04:23 2015 +0000" }, "message": "Merge \"Show better error message for color attr not found.\" into mnc-dev" }, { "commit": "5f1bf496948fb6383ae17e5467a26a00489d7564", "tree": "337db69cf9e0d9b9f44377e098eadd657e9e66f6", "parents": [ "9939961db9765f4e900955cf64ce1c3ceeb9362e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 18 14:39:03 2015 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 18 14:46:12 2015 -0700" }, "message": "Show better error message for color attr not found.\n\nChange-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f\n" }, { "commit": "863e65e123e19254901871426caf39f1145ce3bd", "tree": "23d4557cddab29309d3d5059687cb3fd7cec158f", "parents": [ "2e79d52674e97cfd8ce505114a929afbd5ee316b", "2738c96d998dedfae5b4670d588d0cd299c4ca0f" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon May 18 21:30:15 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 18 21:30:21 2015 +0000" }, "message": "Merge \"Add -round and -notround qualifier to android runtime/aapt\" into mnc-dev" }, { "commit": "1af9913819643a9577a0a73530fe88c3bfd682a9", "tree": "5b96b9ceb290100a5171c3a5d655cadcd4b1ef74", "parents": [ "9939961db9765f4e900955cf64ce1c3ceeb9362e", "71dc5ee2244aa409c0426d3583a014e30d6cf07e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 18 19:30:57 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 18 19:30:58 2015 +0000" }, "message": "Merge \"Fix nav bar spacing for tablets.\" into mnc-dev" } ], "next": "71dc5ee2244aa409c0426d3583a014e30d6cf07e" }