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

Geoff Mendal [Thu, 27 Aug 2015 05:32:55 +0000 (05:32 +0000)]

am c487b900: (-s ours) am 210b38d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c487b9008d26a0f581c78c28e6ee55b3cb0c342b':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 05:32:22 +0000 (05:32 +0000)]

am e46f14e4: (-s ours) am b0819373: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e46f14e42cacfdf3d2941e4d9aa7dc219098b748':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 05:31:30 +0000 (05:31 +0000)]

am 78f313b5: (-s ours) am 88b4a0ac: (-s ours) Import translations. DO NOT MERGE

* commit '78f313b5b266bbc66d44f12b047dedb4a27cf95c':

commit | commitdiff | tree

Lorenzo Colitti [Thu, 27 Aug 2015 05:30:31 +0000 (05:30 +0000)]

am c14f5cf1: (-s ours) am b0b3d0bc: Fix two parsing bugs in new DHCP client.

* commit 'c14f5cf16f2cd9b392f7f1c22ea329839601942a':

commit | commitdiff | tree

Ian Pedowitz [Thu, 27 Aug 2015 05:29:33 +0000 (05:29 +0000)]

am 01988324: (-s ours) am 738a8dfc: Merge "Fixing log typo. s/realted/related" into mnc-dev

* commit '01988324cc52741ea0a596eb8e7b241ac7606012':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 05:28:34 +0000 (05:28 +0000)]

am 40e95ba4: (-s ours) am 85be0c4e: Fix app ops aidl as it is also used from native.

* commit '40e95ba4a588aa7ca4a5be980196f293a6c235a9':

commit | commitdiff | tree

Zhentao Sun [Thu, 27 Aug 2015 04:57:37 +0000 (04:57 +0000)]

am 49ea8298: am 60220b77: am fd538001: Merge "Added event log for camera launch gesture." into mnc-dr-dev

* commit '49ea8298b3c695c208f6887f21f827a825bbff4c':
Added event log for camera launch gesture.

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 04:57:32 +0000 (04:57 +0000)]

am 1aee37ea: am d255b44c: am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev

* commit '1aee37ea3f9ae87967a04aec26fd81caf5f8fea8':
Don't check the keyguard PIN a second time

commit | commitdiff | tree

Rich Slogar [Thu, 27 Aug 2015 04:57:21 +0000 (04:57 +0000)]

am 3fa76699: am f71e3b2b: am 9dbc35d1: am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs

* commit '3fa76699f58275055aaeb229ddd00470795b25f9':
docs: New auto Desktop Head Unit (DHU) docs

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:57:16 +0000 (04:57 +0000)]

am 98922dd0: am 56d0bb7f: am 442c48b9: am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit '98922dd099fb4df25f68f90419e30a4a55df9f89':
LayoutLib: Update golden test images. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:57:11 +0000 (04:57 +0000)]

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

* commit 'b10822335ffe41f226e97b69c5453f8cbe1774a3':
An ugly hack to render CalendarView. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:57:06 +0000 (04:57 +0000)]

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

* commit 'd00d3dfc23f514fd5166790b49175fffd59d5efa':
LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:57:01 +0000 (04:57 +0000)]

am 54d6ff35: am 7d4d67bb: am 14d291e8: am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit '54d6ff358111da3071f38b79494e9ef756d0752e':
Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:56 +0000 (04:56 +0000)]

am e938bdf2: am e831bfd5: am 1ddcfe84: am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit 'e938bdf25a24246511ed5a66c597d5aed89f691e':
Fix layout mirroring. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:51 +0000 (04:56 +0000)]

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

* commit '924831b8dd7cdb0809d305965d38314b16421c25':
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:46 +0000 (04:56 +0000)]

am 1fddda2f: am a5e6fcbd: am 6fb99762: am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit '1fddda2f9c4374ab57a9177f4af463fbf8a59c3a':
Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:41 +0000 (04:56 +0000)]

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

* commit '6f338388967ab238a7053e0c11c1e7884f099da2':
Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:36 +0000 (04:56 +0000)]

am bc4f75db: am 14ebdd92: am f0d24b65: am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit 'bc4f75db805b57a578144b730a6254bfad9eb3b4':
Fix imports. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:31 +0000 (04:56 +0000)]

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

* commit 'cdb02e9266655f696f4a17794a1a7e606fbb95d8':
Fix theme namespace in tests. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:26 +0000 (04:56 +0000)]

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

* commit 'f627f560ac058da3ef7c7ad9d353562b198a9a61':
Run setup for full tests only once. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:21 +0000 (04:56 +0000)]

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

* commit 'a35dad11f3079213eacdf5fe77386d0833f445a8':
LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:16 +0000 (04:56 +0000)]

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

* commit '7783a1e54768fed44b0bc5b1ebb082c7306deff0':
LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:11 +0000 (04:56 +0000)]

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

* commit 'a9f0ba69d462f9ab4a4e7a9582092378f2e3b41c':
Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:07 +0000 (04:56 +0000)]

am 2347ee12: am ddbe2b9e: am 0155fb64: am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit '2347ee12e828a43cf0208e3e4c8de77c4b1ebaeb':
LayoutLib: translucent sys ui bars [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:56:01 +0000 (04:56 +0000)]

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

* commit '7fa4afff48ffa90d4d0bea48e215d79831d31fc5':
Update nav bar icons. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:56 +0000 (04:55 +0000)]

am 94c5608b: am 9916580e: am befeb767: am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '94c5608bcd2f684256d4d4ea1d987c4775347570':
Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:51 +0000 (04:55 +0000)]

am 709b080d: am 78da4c76: am 1f178854: am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit '709b080d597921e5b285825a92f097d9d29eecea':
CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:46 +0000 (04:55 +0000)]

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

* commit '0328e51f81a74efdaba18de65d003348e3282aa3':
Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:41 +0000 (04:55 +0000)]

am f6114abb: am 6befd01e: am 5e570d37: am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit 'f6114abbb6f3898c1e313a4cf199277f5225f669':
Change tools:list_item to listitem. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:36 +0000 (04:55 +0000)]

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

* commit '9dc7b8c3d5c7cc9722666d7c02818da887d803e1':
Implement tools:list_item for RecyclerView. [DO NOT MERGE]

commit | commitdiff | tree

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

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

* commit '8caef72d3c4a468e9140f7bcd1c89c1fcb75a389':
Support AppBar from Material Design. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:25 +0000 (04:55 +0000)]

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

* commit '7ce63e6ed267204789ba4b8f03dd66a056c7b4af':
Update tests per new layoutlib_api [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:20 +0000 (04:55 +0000)]

am bc6347e4: am 88aa6f15: am 4de90cf0: am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit 'bc6347e48dc027f9504eebfd646afbf6fed91a7a':
Add missing resolveResValue call. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:14 +0000 (04:55 +0000)]

am 875af159: am 06fc0dc5: am 15dd3802: am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

* commit '875af15916fc7ff92a74f8cc3d2f47fda2d47656':
LayoutLib: Skip classes from java package. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:09 +0000 (04:55 +0000)]

am 96d8b95f: am 9e559b21: am 74f88968: am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

* commit '96d8b95f6291ac882fa1b630cfeabcd2de745c2a':
Skip warnings for some unresolved references. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:55:04 +0000 (04:55 +0000)]

am a1582e6a: am 7069ff8f: am 1d1fae81: am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

* commit 'a1582e6ae5262891a8db4c2b6eaab90d006c3769':
Fix import order. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:58 +0000 (04:54 +0000)]

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

* commit 'c0f11ab4e902491fdaf0d583bfdae67b0627ef3e':
Fix ParserFactory not initialized error. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:52 +0000 (04:54 +0000)]

am 6a067958: am 42c923e6: am 26bdd0c8: am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

* commit '6a0679587529e0d029f21138a044d7c2194a9529':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:47 +0000 (04:54 +0000)]

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

* commit 'f91820f35206d0878fd9eba5a7633c5bf7020f77':
Fix BridgeTypedArray.getType() [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:42 +0000 (04:54 +0000)]

am 0b42fafe: am 95174adc: am 0b95542d: am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit '0b42fafe66db01d4cf2367c03a330880966b2fd1':
Include Shapes in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:38 +0000 (04:54 +0000)]

am 89c000bd: am 063d75bc: am c0a9faad: am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit '89c000bdfb10c86354c4e8c05cfaa6dc4f49607c':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:33 +0000 (04:54 +0000)]

am 4e49ce3b: am 7e36b8b8: am f3696835: am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

* commit '4e49ce3b5a157fb0c748c42da6785032c7d1f121':
LayoutLib: Change nullity annotations. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:26 +0000 (04:54 +0000)]

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

* commit '5a8f69f95dbd948730675f342856b7dca98908d9':
Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:21 +0000 (04:54 +0000)]

am 52fca404: am 4ca95916: am 0f0cae1a: am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

* commit '52fca404a6c1d97d6b4eb662020f1fc285974ce6':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:16 +0000 (04:54 +0000)]

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

* commit '64a0fb9d9ac74eadacbebca61c5b239354e4db5f':
Inject anonymous inner classes of injected classes [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:10 +0000 (04:54 +0000)]

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

* commit 'e29371342bedd3fc2fd6e78df6d38414685ddf68':
Update platformDir search in tests. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:05 +0000 (04:54 +0000)]

am b2dede6c: am 363bdce9: am 4b030f0b: am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit 'b2dede6c5c7b50f32aa7e4f48c1fb731e638923b':
Make Context.getClassLoader() work. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:54:00 +0000 (04:54 +0000)]

am 2dcf20c4: am 672feef1: am bf2c3b67: am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit '2dcf20c4d283814b697f3d7b6971b8ebc368d35c':
Fix include tag rendering. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:53:55 +0000 (04:53 +0000)]

am ac3df5d4: am ba4f6272: am 8053ef0c: am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

* commit 'ac3df5d492867343eaf6886abf9b098523946045':
Show better error message for color attr not found. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:53:49 +0000 (04:53 +0000)]

am 605e0d84: am 932a9fc5: am 48aea8cc: am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit '605e0d846f55ee3066f602fa2922b6a46f00fe5c':
Fix build: udpate parser factory method [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 04:53:44 +0000 (04:53 +0000)]

am 1037c325: am 33bebe2a: am ac5f66e3: am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

* commit '1037c32528a61e7cd68a484e65dbc953b8df4285':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]

commit | commitdiff | tree

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

am 16a3a82f: am d7147860: am 8affffc7: am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit '16a3a82f38584f652d1b66a55c97eca9b9ea9a1a':
Remove kxml dependency [DO NOT MERGE]

commit | commitdiff | tree

Tim Kilbourn [Thu, 27 Aug 2015 04:53:18 +0000 (04:53 +0000)]

am 32e3e721: am 3b7b06a1: am 487cdebd: am 8f1ea834: Handle the -a flag for dumpsys appops.

* commit '32e3e721877c584adfd5b231d19c23ac7fe5666e':
Handle the -a flag for dumpsys appops.

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 04:53:12 +0000 (04:53 +0000)]

am e0f69aab: am 9df996ed: am 6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev

* commit 'e0f69aabacb9237b3eae9f9cde06fe8772ff6936':
Reformat local Korean numbers in national format.

commit | commitdiff | tree

Zhentao Sun [Thu, 27 Aug 2015 03:37:26 +0000 (03:37 +0000)]

am 60220b77: am fd538001: Merge "Added event log for camera launch gesture." into mnc-dr-dev

* commit '60220b77b920b1547620281b911f0911df1ea249':
Added event log for camera launch gesture.

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 03:37:20 +0000 (03:37 +0000)]

am d255b44c: am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev

* commit 'd255b44c83fa3dfb460c2ef332761bde2cdc4956':
Don't check the keyguard PIN a second time

commit | commitdiff | tree

Zhentao Sun [Thu, 27 Aug 2015 03:31:19 +0000 (03:31 +0000)]

am fd538001: Merge "Added event log for camera launch gesture." into mnc-dr-dev

* commit 'fd538001f5c7f1fad68a27d8143c839bda82491b':
Added event log for camera launch gesture.

commit | commitdiff | tree

Zhentao Sun [Thu, 27 Aug 2015 03:23:46 +0000 (03:23 +0000)]

Merge "Added event log for camera launch gesture." into mnc-dr-dev

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 02:52:16 +0000 (02:52 +0000)]

am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev

* commit 'dfb8cca04dd64dcdf1df4550f7e808360de0517d':
Don't check the keyguard PIN a second time

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 02:44:18 +0000 (02:44 +0000)]

Merge "Don't check the keyguard PIN a second time" into mnc-dr-dev

commit | commitdiff | tree

Rich Slogar [Thu, 27 Aug 2015 02:12:10 +0000 (02:12 +0000)]

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

* commit 'f71e3b2b8e880138b74ab6b1491e771529103093':
docs: New auto Desktop Head Unit (DHU) docs

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:58 +0000 (02:11 +0000)]

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

* commit '56d0bb7f87a089f88f863169f65cf0ddece6a098':
LayoutLib: Update golden test images. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:53 +0000 (02:11 +0000)]

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

* commit '025960a1ba9b4772701273bc78f64a320b528188':
An ugly hack to render CalendarView. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:47 +0000 (02:11 +0000)]

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

* commit '22115d8fc1c7897aae21ec05032764f683b7b9dd':
LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:41 +0000 (02:11 +0000)]

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

* commit '7d4d67bb1e7dad1c6c1e3f616a0b4b3b7e32dd5f':
Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:36 +0000 (02:11 +0000)]

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

* commit 'e831bfd596cc6d8b2e169b3da4fabaf9413283f2':
Fix layout mirroring. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:30 +0000 (02:11 +0000)]

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

* commit '8a872e4a40e559addd90615fa2a723dc5ceea2ea':
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:25 +0000 (02:11 +0000)]

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

* commit 'a5e6fcbdfeebb766df014e3e888a57c1ecae5961':
Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:19 +0000 (02:11 +0000)]

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

* commit 'ec797aa2eaa7778e10779ef2407dd4459045359e':
Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:13 +0000 (02:11 +0000)]

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

* commit '14ebdd9220f0fa608ae6247e47de6a4080094584':
Fix imports. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:07 +0000 (02:11 +0000)]

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

* commit 'dc1bf91f0c83d0ea4087d1a064dbd345d619318b':
Fix theme namespace in tests. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:11:01 +0000 (02:11 +0000)]

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

* commit 'c835bc877e178d05680a9c12787a828f7399ba84':
Run setup for full tests only once. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:10:55 +0000 (02:10 +0000)]

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

* commit '54b801b17574888df11fef5821499309d3a912f1':
LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:10:47 +0000 (02:10 +0000)]

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

* commit 'df4a0199b9e89f4cfe79f294753c84a136c9bad8':
LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:10:42 +0000 (02:10 +0000)]

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

* commit '583c4b23fc81caa17ef6e4c04f87c2ddc20dafdd':
Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:10:36 +0000 (02:10 +0000)]

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

* commit 'ddbe2b9e32d5ce358a7dbf3509ddd5cc4b808173':
LayoutLib: translucent sys ui bars [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:10:29 +0000 (02:10 +0000)]

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

* commit 'f2c8d8fbcab484d6f7bbd9b87d2ab91e18fb1ee6':
Update nav bar icons. [DO NOT MERGE]

commit | commitdiff | tree

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

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

* commit '9916580e2af2181ac8744888352a53804e288714':
Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:10:17 +0000 (02:10 +0000)]

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

* commit '78da4c768515cca2336a06580e743a6daba3ec6c':
CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:10:11 +0000 (02:10 +0000)]

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

* commit '5fd70701b66304cdaed77a57fc62ec7b808ae61a':
Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:10:05 +0000 (02:10 +0000)]

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

* commit '6befd01e546b39582a6a01fbfb81ffbc5f4633aa':
Change tools:list_item to listitem. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:58 +0000 (02:09 +0000)]

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

* commit 'bda7a53775cf435fd494aaa2e2ad441df7addecc':
Implement tools:list_item for RecyclerView. [DO NOT MERGE]

commit | commitdiff | tree

Jens Ole Lauridsen [Thu, 27 Aug 2015 02:09:52 +0000 (02:09 +0000)]

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

* commit 'e34a4f144da800e715a8b8cebb2921c8e809bfb6':
Support AppBar from Material Design. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:46 +0000 (02:09 +0000)]

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

* commit 'f27f1cc1247d349095687eb03c96b8e583bfe332':
Update tests per new layoutlib_api [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:41 +0000 (02:09 +0000)]

am 88aa6f15: am 4de90cf0: am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '88aa6f1532d45e702e95d6930db8c0a142b48f57':
Add missing resolveResValue call. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:35 +0000 (02:09 +0000)]

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

* commit '06fc0dc559775ed0ca5f19f1bc0deb9fba37f010':
LayoutLib: Skip classes from java package. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:29 +0000 (02:09 +0000)]

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

* commit '9e559b218fc2267a8b10e6f0eafcf240ff1e2089':
Skip warnings for some unresolved references. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:24 +0000 (02:09 +0000)]

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

* commit '7069ff8f720e73b280245277f351e80bccf58b4b':
Fix import order. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:19 +0000 (02:09 +0000)]

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

* commit 'ea5cc4cc6521f6787cb17a99c5c24506fde4b40d':
Fix ParserFactory not initialized error. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:13 +0000 (02:09 +0000)]

am 42c923e6: am 26bdd0c8: am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

* commit '42c923e60897fac86867804868f9eacd38346ef0':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:07 +0000 (02:09 +0000)]

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

* commit '604b6ce18786ecab245c3765c34575475b2fd032':
Fix BridgeTypedArray.getType() [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:09:01 +0000 (02:09 +0000)]

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

* commit '95174adc9201c40897ce2510aefd86cfa82dd827':
Include Shapes in LayoutLib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:08:52 +0000 (02:08 +0000)]

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

* commit '063d75bcd139ecb10032f89e4b1007a0e10057d8':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:08:45 +0000 (02:08 +0000)]

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

* commit '7e36b8b820aee9ec659cef1f5c626969bde7602b':
LayoutLib: Change nullity annotations. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:08:37 +0000 (02:08 +0000)]

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

* commit 'b7aa8f7e8c9bd8d135385514b60d2f30508eab75':
Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:08:28 +0000 (02:08 +0000)]

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

* commit '4ca9591677e2e437560aefe865d68ec9587bd77a':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:08:18 +0000 (02:08 +0000)]

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

* commit '6d0a2480ddd11d9b6d4fab21a48ebdd3dca110a2':
Inject anonymous inner classes of injected classes [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:08:11 +0000 (02:08 +0000)]

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

* commit 'd8f30c2b2dc9e27b72ad81d7b4afbf0777a5b243':
Update platformDir search in tests. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 02:07:55 +0000 (02:07 +0000)]

am 363bdce9: am 4b030f0b: am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

* commit '363bdce919fe9a0389c7a59fa44dd7947160b930':
Make Context.getClassLoader() work. [DO NOT MERGE]

commit | commitdiff | tree

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

am 672feef1: am bf2c3b67: am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit '672feef12855de7a70f84b29152bcf9c43068498':
Fix include tag rendering. [DO NOT MERGE]