git.osdn.net Git - android-x86/frameworks-base.git/log

Deepanshu Gupta [Fri, 28 Aug 2015 15:54:11 +0000 (15:54 +0000)]

Merge "Switch SimpleDateFormat to icu version"

Anatol Pomazau [Fri, 28 Aug 2015 15:46:49 +0000 (15:46 +0000)]

am 5af3d58e: am a3d10f01: am c02034a1: am 34c08828: Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-dev

* commit '5af3d58ea2f18e8cc667359f5e80781c6a7004aa':
Fix NPE in AR hardware binding sequence. b/22772433

commit | commitdiff | tree

Anatol Pomazau [Fri, 28 Aug 2015 15:40:51 +0000 (15:40 +0000)]

am a3d10f01: am c02034a1: am 34c08828: Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-dev

* commit 'a3d10f015f01d65091a15bfd698b45246a9819c6':
Fix NPE in AR hardware binding sequence. b/22772433

commit | commitdiff | tree

Anatol Pomazau [Fri, 28 Aug 2015 15:36:30 +0000 (15:36 +0000)]

am c02034a1: am 34c08828: Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-dev

* commit 'c02034a131082080f7dee50c040ee037f6350be2':
Fix NPE in AR hardware binding sequence. b/22772433

commit | commitdiff | tree

Stefan Kuhne [Fri, 28 Aug 2015 15:28:37 +0000 (15:28 +0000)]

Merge "Bring an activity to the front upon click & drag"

commit | commitdiff | tree

Anatol Pomazau [Fri, 28 Aug 2015 15:27:08 +0000 (15:27 +0000)]

am 34c08828: Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-dev

* commit '34c0882898c3e37ea1733e4614233c8a4cb71b67':
Fix NPE in AR hardware binding sequence. b/22772433

commit | commitdiff | tree

Skuhne [Wed, 26 Aug 2015 21:26:17 +0000 (14:26 -0700)]

Bring an activity to the front upon click & drag

Clicking on the control area of a window should bring it to
the top and set the focus since it might be used as a drag
operation which would move / resize it.

Bug: 23179116
Change-Id: I672bfefa42dd85e962fe343aeb89167ce125f168

commit | commitdiff | tree

Anatol Pomazau [Fri, 28 Aug 2015 15:21:38 +0000 (15:21 +0000)]

Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-dev

commit | commitdiff | tree

John Reck [Fri, 28 Aug 2015 15:09:55 +0000 (15:09 +0000)]

Merge "Serializing display lists"

commit | commitdiff | tree

Keisuke Kuroyanagi [Fri, 28 Aug 2015 06:57:22 +0000 (06:57 +0000)]

Merge "Fix: Cursor can be at an invalid offset in EditText."

commit | commitdiff | tree

Tomasz Mikolajewski [Fri, 28 Aug 2015 01:51:26 +0000 (01:51 +0000)]

Merge "Add support for uploading files via MTP."

commit | commitdiff | tree

Tomasz Mikolajewski [Mon, 24 Aug 2015 07:10:51 +0000 (16:10 +0900)]

Add support for uploading files via MTP.

Change-Id: Id1811ab70cb28be471e0a99999e9ad5380deac49

commit | commitdiff | tree

destradaa [Tue, 28 Jul 2015 00:14:03 +0000 (17:14 -0700)]

Fix NPE in AR hardware binding sequence.
b/22772433

To keep the old Watcher binding sequence backwards compatible,
it is required to ensure that the callback is only invoked if
the feature is supported by the platform, and an instance is
available.

Change-Id: I0a6335f10647184abdad3ee1583b505160a3308f

commit | commitdiff | tree

Ashish Sharma [Fri, 28 Aug 2015 00:09:24 +0000 (00:09 +0000)]

am b804f413: am fec26a37: am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev

* commit 'b804f4134a21989c94ead728b6d36f93a647ce36':
BatteryStats: Bump checkin version

commit | commitdiff | tree

Rich Slogar [Fri, 28 Aug 2015 00:05:25 +0000 (00:05 +0000)]

am 4d6d9b7f: am 9cc1765d: am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs

* commit '4d6d9b7f2a47b0b386e8ed7bd18982889684fb47':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:05:18 +0000 (00:05 +0000)]

am e3107eae: (-s ours) am e85d798b: (-s ours) am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit 'e3107eae9640fd6ebb83b372011fc55f7c97dc66':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:05:10 +0000 (00:05 +0000)]

am e66df909: (-s ours) am 82c66da0: (-s ours) am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit 'e66df909b9e138d8254c1a5bb08fe79bf473aa69':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:05:00 +0000 (00:05 +0000)]

am f28d461f: (-s ours) am be561e3a: (-s ours) am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

* commit 'f28d461fc599c92832977ee69dda4d3475a9e5fa':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:04:51 +0000 (00:04 +0000)]

am eb75d5bc: (-s ours) am 8bc89186: (-s ours) am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit 'eb75d5bc1856aa1458657e03d511718b713029ec':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:04:43 +0000 (00:04 +0000)]

am e264d643: (-s ours) am 5432ab8d: (-s ours) am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit 'e264d6439d1de2cb6ff80f70213e402174bc61e5':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:04:31 +0000 (00:04 +0000)]

am 3f2199e2: (-s ours) am 44c3a9eb: (-s ours) am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

* commit '3f2199e21a8da1465de39bdf35fda6b4dc1b5387':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:04:23 +0000 (00:04 +0000)]

am fb23e590: (-s ours) am 18db4f5f: (-s ours) am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit 'fb23e590e3f17e68cf04eac9c86c066956ff723d':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:04:12 +0000 (00:04 +0000)]

am bc92ab15: (-s ours) am e40990e0: (-s ours) am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit 'bc92ab1522c17bebf00a9e95076a1cd097db9896':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:04:05 +0000 (00:04 +0000)]

am 6707998d: (-s ours) am 575451d5: (-s ours) am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit '6707998d1a4f30d07f0f353050fc40913da572a5':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:03:56 +0000 (00:03 +0000)]

am af72d494: (-s ours) am 8d2e0fbc: (-s ours) am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit 'af72d494d2f2e7872e268df710b7f96b5631fe60':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:03:46 +0000 (00:03 +0000)]

am e399f05d: (-s ours) am e6f74816: (-s ours) am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit 'e399f05dc6ddc8acb638a1b84001374df855544c':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:03:39 +0000 (00:03 +0000)]

am cabb2669: (-s ours) am f2cf3c19: (-s ours) am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'cabb2669def2d32d5fd93b2fa6b8a036da0b3e70':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:03:31 +0000 (00:03 +0000)]

am 9ed0e048: (-s ours) am 7a7becd6: (-s ours) am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '9ed0e048948b36bc489ba39473860bfa2f0be7fa':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:03:22 +0000 (00:03 +0000)]

am 5967d4e6: (-s ours) am aae9a105: (-s ours) am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit '5967d4e68257d0a74b38b49804a0c0f408e83263':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:03:16 +0000 (00:03 +0000)]

am 4dd4b38a: (-s ours) am 755b7f3a: (-s ours) am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit '4dd4b38a7adbbcbd24a73f859695f4892db0a262':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:03:09 +0000 (00:03 +0000)]

am 7f68345f: (-s ours) am 3ece6d8c: (-s ours) am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '7f68345f193d8b44a596afd942d9060b510467af':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:03:02 +0000 (00:03 +0000)]

am 09a44f1e: (-s ours) am 4523c862: (-s ours) am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '09a44f1e4c6652d6db7de14b0cbd4c592ba5defb':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:02:54 +0000 (00:02 +0000)]

am 5dd32243: (-s ours) am 6d738bb6: (-s ours) am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit '5dd32243c9224a82485a17911da800b647c060a2':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:02:46 +0000 (00:02 +0000)]

am ce193dfd: (-s ours) am c32e8d4f: (-s ours) am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit 'ce193dfdf5960a411e413af00a4e2ea67e8c3e04':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:02:36 +0000 (00:02 +0000)]

am 2ac8197a: (-s ours) am d2dd844b: (-s ours) am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit '2ac8197a93ceacadd349c1c2b712c0bb3148b5ea':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:02:28 +0000 (00:02 +0000)]

am 42c9d464: (-s ours) am 9a0c696c: (-s ours) am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit '42c9d4643ff914d32e36d2224f39e8114103514f':

commit | commitdiff | tree

Jens Ole Lauridsen [Fri, 28 Aug 2015 00:02:20 +0000 (00:02 +0000)]

am 69001679: (-s ours) am e870314c: (-s ours) am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit '69001679bb406ed9334f3ac902265f05b0633d9a':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:02:10 +0000 (00:02 +0000)]

am e9d3e12d: (-s ours) am aa5786e8: (-s ours) am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit 'e9d3e12d65f0f6c8d3183f3bbcaee22c6fab2d9e':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:02:01 +0000 (00:02 +0000)]

am c4bca0dc: (-s ours) am 93db9633: (-s ours) am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit 'c4bca0dc140ec88b4bc0293e28e253d02f916e6f':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:01:51 +0000 (00:01 +0000)]

am 3dc7c488: (-s ours) am 6953cdae: (-s ours) am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit '3dc7c4882090753ac9c1377a362004580105fd55':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:01:42 +0000 (00:01 +0000)]

am 648e8c47: (-s ours) am 4ac79e44: (-s ours) am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

* commit '648e8c4766f1fba42712b6d671771e1131832db2':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:01:32 +0000 (00:01 +0000)]

am 2c586f64: (-s ours) am 65f8923a: (-s ours) am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

* commit '2c586f64c98ee7e4a4d3c2237f8a61c09a015d13':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:01:23 +0000 (00:01 +0000)]

am 8943d6ca: (-s ours) am c8e51c1e: (-s ours) am 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

* commit '8943d6ca39f8c6c27db6879bc7180da1d6ca2656':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:01:12 +0000 (00:01 +0000)]

am ba820487: (-s ours) am 1e4fbdf3: (-s ours) am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

* commit 'ba820487ed9b3e118942604785708ecbccf1b999':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:01:04 +0000 (00:01 +0000)]

am b0ef54ab: (-s ours) am b19e8427: (-s ours) am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

* commit 'b0ef54abb279e4ddf586b53de5a85c881bb2adab':

commit | commitdiff | tree

Deepanshu Gupta [Fri, 28 Aug 2015 00:00:51 +0000 (00:00 +0000)]

am a5f85591: (-s ours) am 4db2aa3f: (-s ours) am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit 'a5f8559152355033b4bdaea423460651df6d61ee':

commit | commitdiff | tree

Ashish Sharma [Thu, 27 Aug 2015 23:55:47 +0000 (23:55 +0000)]

am fec26a37: am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev

* commit 'fec26a37a15dc406ae6a3aee67059cb93ef2ae5a':
BatteryStats: Bump checkin version

commit | commitdiff | tree

Rich Slogar [Thu, 27 Aug 2015 23:50:56 +0000 (23:50 +0000)]

am 9cc1765d: am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs

* commit '9cc1765d1ea4f2990e1916cde505a574369497da':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:50:49 +0000 (23:50 +0000)]

am e85d798b: (-s ours) am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit 'e85d798b4a8574c7302644ccd911ccd7dcf53faf':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:50:42 +0000 (23:50 +0000)]

am 82c66da0: (-s ours) am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit '82c66da0b63b77b90eb964417892e6d611e1c414':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:50:34 +0000 (23:50 +0000)]

am be561e3a: (-s ours) am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

* commit 'be561e3aa37c728b3173aac02767063a735ec5eb':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:50:26 +0000 (23:50 +0000)]

am 8bc89186: (-s ours) am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit '8bc89186721c0679c543f330231bf25015aef1ea':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:50:18 +0000 (23:50 +0000)]

am 5432ab8d: (-s ours) am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit '5432ab8dc08fd8dabc60bba304135a68badcf9ee':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:50:12 +0000 (23:50 +0000)]

am 44c3a9eb: (-s ours) am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

* commit '44c3a9eb72d091a05c88ac53da33d8d3429e987a':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:50:05 +0000 (23:50 +0000)]

am 18db4f5f: (-s ours) am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit '18db4f5f8f75006eb9d3f1091e5f24b9066b2bf8':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:57 +0000 (23:49 +0000)]

am e40990e0: (-s ours) am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit 'e40990e024969d0271529164e6112715d8b6d004':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:50 +0000 (23:49 +0000)]

am 575451d5: (-s ours) am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit '575451d5ffccc0df794852b8a2c25045ff9f9074':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:43 +0000 (23:49 +0000)]

am 8d2e0fbc: (-s ours) am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit '8d2e0fbc2ee7205afc06913a5fb2627001afcc24':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:36 +0000 (23:49 +0000)]

am e6f74816: (-s ours) am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit 'e6f7481631c1fd7a0d36d4515cf56f6c64e48267':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:29 +0000 (23:49 +0000)]

am f2cf3c19: (-s ours) am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'f2cf3c19e356ad34a181933742c64c842e431513':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:22 +0000 (23:49 +0000)]

am 7a7becd6: (-s ours) am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '7a7becd621cc3d4659e8e480fc7ebb5c1e4f0d6c':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:15 +0000 (23:49 +0000)]

am aae9a105: (-s ours) am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit 'aae9a105e9bf3a92033cc06481eb2fa40c6c6144':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:12 +0000 (23:49 +0000)]

am 30ffb971: (-s ours) am 162a7997: (-s ours) am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit '30ffb97146c975e9f9d2ed7377b5ae777748468d':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:08 +0000 (23:49 +0000)]

am 755b7f3a: (-s ours) am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit '755b7f3a46b6d504760f4a422c92c731f3cdb1a2':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:49:05 +0000 (23:49 +0000)]

am 6f46f83a: (-s ours) am 5ae9de3a: (-s ours) am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit '6f46f83a29a482feb6fe39327d9f48dc0932a639':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:59 +0000 (23:48 +0000)]

am 3ece6d8c: (-s ours) am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '3ece6d8c8830191586210d98169fbabc802d4e62':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:57 +0000 (23:48 +0000)]

am 2ba9df7c: (-s ours) am 330d6104: (-s ours) am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit '2ba9df7c724e18a1131e289665bc1615dc78bbcd':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:52 +0000 (23:48 +0000)]

am 4523c862: (-s ours) am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '4523c86247621d683d03ed70dedd68b000df3943':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:49 +0000 (23:48 +0000)]

am 0d5ab304: (-s ours) am 594f76d2: (-s ours) am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit '0d5ab3049b81e69b7a97dca199eb399c6dc69375':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:44 +0000 (23:48 +0000)]

am 6d738bb6: (-s ours) am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit '6d738bb6049d7ae5bf4b554796c93a8924ab545c':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:42 +0000 (23:48 +0000)]

am aa86a563: (-s ours) am 14b65389: (-s ours) am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

* commit 'aa86a563cff1d0ae510e5d17316f23728e638b9d':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:30 +0000 (23:48 +0000)]

am 939571a8: (-s ours) am 4efc4817: (-s ours) am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit '939571a8d346b8f838dc861b145586584aec2199':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:28 +0000 (23:48 +0000)]

am c32e8d4f: (-s ours) am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit 'c32e8d4f348042f4e431bc0bb4e635dca1886bf7':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:23 +0000 (23:48 +0000)]

am 87a1d17f: (-s ours) am 268a4616: (-s ours) am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit '87a1d17fb93260e43efa840d21484b9b4d457204':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:20 +0000 (23:48 +0000)]

am d2dd844b: (-s ours) am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit 'd2dd844bac3693daae223f51c5242e88e821de22':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:16 +0000 (23:48 +0000)]

am 454c0251: (-s ours) am a012a91b: (-s ours) am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit '454c025167d25f8da03a53261a40e55c5be2daf0':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:12 +0000 (23:48 +0000)]

am 9a0c696c: (-s ours) am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit '9a0c696c468fd4029d67af4cc9513045e07665da':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:09 +0000 (23:48 +0000)]

am 22b324d4: (-s ours) am 54dd25f0: (-s ours) am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

* commit '22b324d4c3313d3b2da921dcaa462b166ef4b698':

commit | commitdiff | tree

Jens Ole Lauridsen [Thu, 27 Aug 2015 23:48:04 +0000 (23:48 +0000)]

am e870314c: (-s ours) am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit 'e870314ce91a02c1c375881494605cbc14aa248d':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:48:00 +0000 (23:48 +0000)]

am d9adc588: (-s ours) am 4c276bb9: (-s ours) am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit 'd9adc588c901af749cb5d0876a46b67fcd024bf4':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:50 +0000 (23:47 +0000)]

am aa5786e8: (-s ours) am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit 'aa5786e8aede3530ed22780461018c6f885d54af':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:50 +0000 (23:47 +0000)]

am 392a7cd5: (-s ours) am 4509e3d2: (-s ours) am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

* commit '392a7cd5dea06fafc2f37a0560c41ad6bda373f9':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:42 +0000 (23:47 +0000)]

am aaf7aab4: (-s ours) am 7781467d: (-s ours) am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit 'aaf7aab422e8ca479ce8eefdea23e52779f96a9a':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:41 +0000 (23:47 +0000)]

am 93db9633: (-s ours) am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '93db9633565331d91aac690382b432c9e689ad89':

commit | commitdiff | tree

Tim Kilbourn [Thu, 27 Aug 2015 23:47:31 +0000 (23:47 +0000)]

am 533d3b60: am dbcad63b: am 8f1ea834: Handle the -a flag for dumpsys appops.

* commit '533d3b60521251c0519f9cb937c53dede058bb08':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:29 +0000 (23:47 +0000)]

am 6953cdae: (-s ours) am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit '6953cdaebad1fad6f25dd9357409d70310cfd116':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:21 +0000 (23:47 +0000)]

am 4ac79e44: (-s ours) am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

* commit '4ac79e44d35afbc5da451cfefb48da4c62a96bbf':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:09 +0000 (23:47 +0000)]

am 65f8923a: (-s ours) am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

* commit '65f8923a25b2ed40878f7d13708f2109c3c8eb2a':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:47:00 +0000 (23:47 +0000)]

am c8e51c1e: (-s ours) am 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

* commit 'c8e51c1e10c82d825b130441dceefbf749bb0a26':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:46:44 +0000 (23:46 +0000)]

am 1e4fbdf3: (-s ours) am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

* commit '1e4fbdf315eb546b4c112514e166c62ca017f279':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:46:36 +0000 (23:46 +0000)]

am b19e8427: (-s ours) am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

* commit 'b19e84277e54c989bb7cd8056ece33d3242ed4fa':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:46:19 +0000 (23:46 +0000)]

am 4db2aa3f: (-s ours) am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit '4db2aa3f469756cb59c5ff64bbd0a0862bdd45c4':

commit | commitdiff | tree

Rubin Xu [Thu, 27 Aug 2015 23:44:06 +0000 (23:44 +0000)]

Merge "Reactivate backup service after device owner is cleared."

commit | commitdiff | tree

Ashish Sharma [Thu, 27 Aug 2015 23:42:19 +0000 (23:42 +0000)]

am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev

* commit '7c388b0f73b1b2f881aa97458657a394e43e6727':
BatteryStats: Bump checkin version

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:46 +0000 (23:39 +0000)]

am 162a7997: (-s ours) am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit '162a799773594580a36773decd4fcb7c14f77dc7':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:39 +0000 (23:39 +0000)]

am 5ae9de3a: (-s ours) am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit '5ae9de3a241f7549c1ab8ea5e687c5b263aa0623':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:31 +0000 (23:39 +0000)]

am 330d6104: (-s ours) am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit '330d6104b7f0f74288e28f407a87afa6c468f2c9':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:23 +0000 (23:39 +0000)]

am 594f76d2: (-s ours) am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit '594f76d25b55efb8ebda690dbcb55ed70f064241':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:16 +0000 (23:39 +0000)]

am 14b65389: (-s ours) am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

* commit '14b65389a22162274dadc6febd523fafb19c0e99':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 23:39:08 +0000 (23:39 +0000)]

am 4efc4817: (-s ours) am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit '4efc48170ee1013303b92c0912cb35460167c057':