OSDN Git Service

android-x86/frameworks-base.git
8 years agoam de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:00 +0000 (01:32 +0000)]
am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

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

8 years agoam 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:53 +0000 (01:31 +0000)]
am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

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

8 years agoam 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:48 +0000 (01:31 +0000)]
am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

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

8 years agoam c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:40 +0000 (01:31 +0000)]
am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

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

8 years agoam 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:34 +0000 (01:31 +0000)]
am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

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

8 years agoam 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSe...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

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

8 years agoam 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.stylea...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:20 +0000 (01:31 +0000)]
am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

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

8 years agoam 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a Drawe...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:12 +0000 (01:31 +0000)]
am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

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

8 years agoam 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:03 +0000 (01:31 +0000)]
am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

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

8 years agoam a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for Recycl...
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:54 +0000 (01:30 +0000)]
am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

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

8 years agoam 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design...
Jens Ole Lauridsen [Thu, 27 Aug 2015 01:30:43 +0000 (01:30 +0000)]
am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

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

8 years agoam 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api...
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:35 +0000 (01:30 +0000)]
am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

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

8 years agoam c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call...
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:27 +0000 (01:30 +0000)]
am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

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

8 years agoam e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java...
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:14 +0000 (01:30 +0000)]
am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

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

8 years agoam 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved...
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:08 +0000 (01:30 +0000)]
am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

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

8 years agoam 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:02 +0000 (01:30 +0000)]
am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

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

8 years agoam 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized...
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:50 +0000 (01:29 +0000)]
am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

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

8 years agoam bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyle...
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:43 +0000 (01:29 +0000)]
am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

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

8 years agoam f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() ...
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:36 +0000 (01:29 +0000)]
am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

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

8 years agoam 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO...
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:30 +0000 (01:29 +0000)]
am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit '7ec7805a50893be6242a41de01299cb1de44b461':
  Include Shapes in LayoutLib. [DO NOT MERGE]

8 years agoam 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource...
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:19 +0000 (01:29 +0000)]
am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit '594939fc07e83445ef4507df6fcd457069352189':
  LayoutLib: Support getting resource arrays. [DO NOT MERGE]

8 years agoam bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotation...
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:10 +0000 (01:29 +0000)]
am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

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

8 years agoam 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in...
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:05 +0000 (01:29 +0000)]
am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

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

8 years agoam 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail...
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:58 +0000 (01:28 +0000)]
am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

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

8 years agoam d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of...
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:48 +0000 (01:28 +0000)]
am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

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

8 years agoam 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests...
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:42 +0000 (01:28 +0000)]
am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

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

8 years agoam aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work...
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:35 +0000 (01:28 +0000)]
am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

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

8 years agoam 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT...
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit '522e67e4ac600fb19c18f55f0e51096af9ae37d3':
  Fix include tag rendering. [DO NOT MERGE]

8 years agoam 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color...
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:14 +0000 (01:28 +0000)]
am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

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

8 years agoam 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory...
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:07 +0000 (01:28 +0000)]
am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit '59f026e937e749a77f12614010f8be05123f4837':
  Fix build: udpate parser factory method [DO NOT MERGE]

8 years agoam b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback refere...
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:52 +0000 (01:27 +0000)]
am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

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

8 years agoam 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:45 +0000 (01:27 +0000)]
am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

* commit '78d77bc379f42dfe020cf0719ceae14174cf1c33':
  Remove kxml dependency [DO NOT MERGE]

8 years agoHandle the -a flag for dumpsys appops.
Tim Kilbourn [Wed, 26 Aug 2015 22:07:37 +0000 (15:07 -0700)]
Handle the -a flag for dumpsys appops.

Bug: 23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f

8 years agoMerge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
Alan Viverette [Wed, 26 Aug 2015 20:38:53 +0000 (20:38 +0000)]
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev

8 years agoam e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:38 +0000 (20:21 +0000)]
am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

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

8 years agoam 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:29 +0000 (20:21 +0000)]
am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

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

8 years agoam e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. ...
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:23 +0000 (20:21 +0000)]
am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

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

8 years agoam 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:16 +0000 (20:21 +0000)]
am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

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

8 years agoam d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:21:09 +0000 (20:21 +0000)]
am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

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

8 years agoam d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT...
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:58 +0000 (20:20 +0000)]
am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

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

8 years agoam 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. ...
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:53 +0000 (20:20 +0000)]
am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

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

8 years agoam e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:45 +0000 (20:20 +0000)]
am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

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

8 years agoam b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:35 +0000 (20:20 +0000)]
am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

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

8 years agoam 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:30 +0000 (20:20 +0000)]
am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

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

8 years agoam 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]
Jens Ole Lauridsen [Wed, 26 Aug 2015 20:20:24 +0000 (20:20 +0000)]
am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

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

8 years agoam 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:17 +0000 (20:20 +0000)]
am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

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

8 years agoam 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:11 +0000 (20:20 +0000)]
am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

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

8 years agoam ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:05 +0000 (20:20 +0000)]
am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

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

8 years agoam 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:58 +0000 (20:19 +0000)]
am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

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

8 years agoam 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:52 +0000 (20:19 +0000)]
am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

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

8 years agoam c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:39 +0000 (20:19 +0000)]
am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

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

8 years agoam 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT...
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:32 +0000 (20:19 +0000)]
am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

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

8 years agoam 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:23 +0000 (20:19 +0000)]
am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

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

8 years agoam 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:13 +0000 (20:19 +0000)]
am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

* commit '8a6295e82a2aed91eb26fa15479bf295c2bd79d7':
  Include Shapes in LayoutLib. [DO NOT MERGE]

8 years agoam 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:05 +0000 (20:19 +0000)]
am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

* commit '66d5f24df0c3627028812ee23da8d4f08cc83e5c':
  LayoutLib: Support getting resource arrays. [DO NOT MERGE]

8 years agoam b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:54 +0000 (20:18 +0000)]
am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

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

8 years agoam 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO...
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:47 +0000 (20:18 +0000)]
am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

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

8 years agoam 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix)....
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:34 +0000 (20:18 +0000)]
am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

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

8 years agoam 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO...
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:27 +0000 (20:18 +0000)]
am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

* commit '2e57c1e23f43bb0ede6280720559ccc1e866024b':
  Inject anonymous inner classes of injected classes [DO NOT MERGE]

8 years agoam 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:15 +0000 (20:18 +0000)]
am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

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

8 years agoam 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:09 +0000 (20:18 +0000)]
am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

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

8 years agoam de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:04 +0000 (20:18 +0000)]
am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

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

8 years agoam 50e1406a: am f6b08547: Show better error message for color attr not found. [DO...
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:51 +0000 (20:17 +0000)]
am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

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

8 years agoam 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:46 +0000 (20:17 +0000)]
am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

* commit '81990c3f988369c755590288b93508e30024c56c':
  Fix build: udpate parser factory method [DO NOT MERGE]

8 years agoam 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:40 +0000 (20:17 +0000)]
am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

* commit '0a07bb95a1dd94c3457860a934d3ee546919cff2':
  Don't keep LayoutlibCallback reference. [DO NOT MERGE]

8 years agoam bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:34 +0000 (20:17 +0000)]
am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

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

8 years agoAvoid NPE when getPositionForView() is called on detached view
Alan Viverette [Wed, 26 Aug 2015 19:21:39 +0000 (15:21 -0400)]
Avoid NPE when getPositionForView() is called on detached view

Bug: 23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20

8 years agoMerge "Camera: Update for reprocess session" into mnc-dev
Chien-Yu Chen [Wed, 26 Aug 2015 18:56:15 +0000 (18:56 +0000)]
Merge "Camera: Update for reprocess session" into mnc-dev

8 years agoMerge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:17:03 +0000 (18:17 +0000)]
Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev

8 years agoam 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:25 +0000 (05:57 +0000)]
am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

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

8 years agoam 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:17 +0000 (05:57 +0000)]
am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

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

8 years agoam d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:13 +0000 (05:57 +0000)]
am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

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

8 years agoam 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:08 +0000 (05:57 +0000)]
am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

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

8 years agoam 9068539a: Update nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:04 +0000 (05:57 +0000)]
am 9068539a: Update nav bar icons. [DO NOT MERGE]

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

8 years agoam e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:59 +0000 (05:56 +0000)]
am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

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

8 years agoam c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:55 +0000 (05:56 +0000)]
am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

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

8 years agoam b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:50 +0000 (05:56 +0000)]
am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

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

8 years agoam a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:45 +0000 (05:56 +0000)]
am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

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

8 years agoam b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:41 +0000 (05:56 +0000)]
am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

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

8 years agoam cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]
Jens Ole Lauridsen [Wed, 26 Aug 2015 05:56:36 +0000 (05:56 +0000)]
am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

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

8 years agoam de13095d: Update tests per new layoutlib_api [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:31 +0000 (05:56 +0000)]
am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

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

8 years agoam db67caa6: Add missing resolveResValue call. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:27 +0000 (05:56 +0000)]
am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

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

8 years agoam 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:22 +0000 (05:56 +0000)]
am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]

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

8 years agoam 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:08 +0000 (05:56 +0000)]
am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

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

8 years agoam 3e875dbb: Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:00 +0000 (05:56 +0000)]
am 3e875dbb: Fix import order. [DO NOT MERGE]

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

8 years agoam e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:47 +0000 (05:55 +0000)]
am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]

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

8 years agoam a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:42 +0000 (05:55 +0000)]
am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

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

8 years agoam e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:37 +0000 (05:55 +0000)]
am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]

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

8 years agoam e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:33 +0000 (05:55 +0000)]
am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]

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

8 years agoam ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:26 +0000 (05:55 +0000)]
am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]

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

8 years agoam a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:19 +0000 (05:55 +0000)]
am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]

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

8 years agoam c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:14 +0000 (05:55 +0000)]
am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

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

8 years agoam b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:07 +0000 (05:55 +0000)]
am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

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

8 years agoam cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:02 +0000 (05:55 +0000)]
am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]

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

8 years agoam d7e89906: Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:58 +0000 (05:54 +0000)]
am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

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

8 years agoam afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:52 +0000 (05:54 +0000)]
am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]

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

8 years agoam 92480a9a: Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:44 +0000 (05:54 +0000)]
am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit '92480a9ad89a813bdf36185fa8c4d227d8415b4c':
  Fix include tag rendering. [DO NOT MERGE]

8 years agoam f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:39 +0000 (05:54 +0000)]
am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

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

8 years agoam b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:33 +0000 (05:54 +0000)]
am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]

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

8 years agoam aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:28 +0000 (05:54 +0000)]
am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]

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