OSDN Git Service

android-x86/frameworks-base.git
8 years agoam e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp...
Zach Jang [Mon, 21 Sep 2015 19:10:46 +0000 (19:10 +0000)]
am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'e54c195a53694696e0913722fa721c882e33753e':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security...
Zach Jang [Mon, 21 Sep 2015 18:58:18 +0000 (18:58 +0000)]
am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 22:00:29 +0000 (22:00 +0000)]
am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

* commit '683cd049f7c762251567a0e0386ee49bb1428351':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoresolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 21:34:08 +0000 (17:34 -0400)]
resolved conflicts for 521def98 to lmp-mr1-dev

8 years agoam 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level...
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoDO NOT MERGE - Backport of ag/748165 to klp-dev
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d

8 years agoam 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt...
Zach Jang [Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)]
am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

8 years agoam 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s...
Zach Jang [Wed, 16 Sep 2015 01:44:53 +0000 (01:44 +0000)]
am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

8 years agoMerge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""...
Zach Jang [Wed, 16 Sep 2015 01:40:18 +0000 (01:40 +0000)]
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

8 years agoRevert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:38:41 +0000 (01:38 +0000)]
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d

8 years agoMerge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp...
Zach Jang [Wed, 16 Sep 2015 01:37:36 +0000 (01:37 +0000)]
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

8 years agoRevert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Tue, 15 Sep 2015 20:09:52 +0000 (20:09 +0000)]
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f

8 years agoam 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Sat, 12 Sep 2015 06:29:09 +0000 (06:29 +0000)]
am 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

* commit '4c330c6ae53df48f6486b6f047021b204fc66594':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoam eb26f5ce: LayoutLib: Fix typedArray caching.
Deepanshu Gupta [Tue, 1 Sep 2015 23:40:40 +0000 (23:40 +0000)]
am eb26f5ce: LayoutLib: Fix typedArray caching.

* commit 'eb26f5cecd5366b29b3cb746a7edaf3769f40480':
  LayoutLib: Fix typedArray caching.

8 years agoLayoutLib: Fix typedArray caching.
Deepanshu Gupta [Wed, 26 Aug 2015 18:54:50 +0000 (11:54 -0700)]
LayoutLib: Fix typedArray caching.

The typedArray depends on the current context (more specifically, the
themes set on the context). The fact was ignored in the caching of the
typedArray and caused the android:theme attribute to be ignored in
certain cases.

Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0

8 years agoam 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for...
Bart Sears [Mon, 31 Aug 2015 22:03:48 +0000 (22:03 +0000)]
am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

* commit '199c74eab1a30bff7db7bb4d24c161f36edb7f5b':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoam 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Tao Bao [Mon, 31 Aug 2015 22:03:44 +0000 (22:03 +0000)]
am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

* commit '82b70db7dd906013d131737a5bec2ae59b41ae61':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

8 years agoMerge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into...
Bart Sears [Mon, 31 Aug 2015 21:53:46 +0000 (21:53 +0000)]
Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

8 years ago[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Tao Bao [Sat, 29 Aug 2015 00:46:20 +0000 (17:46 -0700)]
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d

8 years agoDO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584

8 years agoDO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584

8 years agoam a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:35 +0000 (05:58 +0000)]
am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

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

8 years agoam c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:30 +0000 (05:58 +0000)]
am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

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

8 years agoam b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:25 +0000 (05:58 +0000)]
am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

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

8 years agoam da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:21 +0000 (05:58 +0000)]
am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

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

8 years agoam 8c674fda: Fix layout mirroring. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:16 +0000 (05:58 +0000)]
am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

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

8 years agoam 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:58:06 +0000 (05:58 +0000)]
am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

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

8 years agoam 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:58 +0000 (05:57 +0000)]
am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

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

8 years agoam 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:53 +0000 (05:57 +0000)]
am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

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

8 years agoam 6b1b651f: Fix imports. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:48 +0000 (05:57 +0000)]
am 6b1b651f: Fix imports. [DO NOT MERGE]

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

8 years agoam 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:40 +0000 (05:57 +0000)]
am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

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

8 years agoam 723e136f: Run setup for full tests only once. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:57:31 +0000 (05:57 +0000)]
am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

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

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]

8 years agoam 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:23 +0000 (05:54 +0000)]
am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]

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

8 years agoLayoutLib: Update golden test images. [DO NOT MERGE]
Deepanshu Gupta [Tue, 25 Aug 2015 23:13:23 +0000 (16:13 -0700)]
LayoutLib: Update golden test images. [DO NOT MERGE]

Also update the generated classes from the MyApplication test project.

Change-Id: I97bce3737c0cb528a61fa652988a2edb09ec885d

8 years agoAn ugly hack to render CalendarView. [DO NOT MERGE]
Deepanshu Gupta [Tue, 25 Aug 2015 23:06:57 +0000 (16:06 -0700)]
An ugly hack to render CalendarView. [DO NOT MERGE]

This is an ugly hack to switch the field
android.widget.SimpleMonthView.mDayFormatter from
java.text.SimpleDateFormat to icu's version of the same class. The hack
is only for the L version of the LayoutLib. It's done in a better way in
M and even better in N.

Change-Id: Id84a1d32040211c46b20cdaf3a77119676e748b6

8 years agoLayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
Deepanshu Gupta [Sat, 22 Aug 2015 00:23:50 +0000 (17:23 -0700)]
LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

Change-Id: Ieedf23cde9ab3e36c77501d30cc7e808e66a4782
(cherry picked from commit f9662c006c650c9f61f19a5e1ea4a76640eb85ca)

8 years agoMake getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
Deepanshu Gupta [Tue, 4 Aug 2015 18:57:10 +0000 (11:57 -0700)]
Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

The XML editor already warns about the empty strings in places where an
int value is required. There's no need to show another warning for it in
the rendering panel. Also, the rendering might have also failed when the
empty string is encountered. Try an continue the rendering, because no
rendering state is really bad.

Change-Id: I85106f37e4462f237e85f0b065b4ce8a4bfabf4d
(cherry picked from commit 0437cac76c24dc6cac7b530e6d80f789565550ec)

8 years agoFix layout mirroring. [DO NOT MERGE]
Deepanshu Gupta [Tue, 4 Aug 2015 18:56:44 +0000 (11:56 -0700)]
Fix layout mirroring. [DO NOT MERGE]

Change-Id: I7db398aa2d11dac1210e84922138f78f0c23bb9b
(cherry picked from commit a9090705efcc44f015486944e5aeb926173a7968)

8 years agoFix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 31 Jul 2015 20:10:18 +0000 (13:10 -0700)]
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

Change-Id: Ia8d223ae01f08df945ab05615b07075b98a54a32
(cherry picked from commit 5a8f33f1b09b0311f1bbd1ec6b90db706edb5219)

8 years agoFix Matrix_Delegate.native_getValues() [DO NOT MERGE]
Deepanshu Gupta [Mon, 3 Aug 2015 17:23:56 +0000 (10:23 -0700)]
Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

The bug manifested itself by not rendering the wifi icon in the status
bar.

Change-Id: I7debf3eef387965d774bf66e856812e67c8552a7
(cherry picked from commit 9f280a9301566c94a583cc45b6abea8a4488e33c)

8 years agoRevert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
Deepanshu Gupta [Mon, 3 Aug 2015 18:25:45 +0000 (11:25 -0700)]
Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

Use AppTheme for all tests other than testExpand. AppTheme contains an
attribute needed by testArrayCheck. Also, since the AppTheme extends
Theme.Material.Light.DarkActionBar, other tests should be unaffected.

Also, update the golden image for the testArrayCheck.

Change-Id: Ib5f53f3b029c5aceef2b622e5ac63952d6b1972a
(cherry picked from commit 89a045c31f4f08bc0d9d533ef47f321e6423f656)

8 years agoFix imports. [DO NOT MERGE]
Deepanshu Gupta [Mon, 27 Jul 2015 17:11:03 +0000 (10:11 -0700)]
Fix imports. [DO NOT MERGE]

Also remove null checks on return value of ReflectionUtils.getMethod()
as the method always return non null.

Change-Id: Ib476302c2cf0504a0f54db4e795955ad10e5df3f
(cherry picked from commit 671b7f9b99316f7224c1213d6923d449a2de9b62)

8 years agoFix theme namespace in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 29 Jul 2015 18:12:44 +0000 (11:12 -0700)]
Fix theme namespace in tests. [DO NOT MERGE]

The tests used framework theme (Material), but the ResourceResolver was
created with project theme. This caused tests to fail becasue of missing
resources.

Change-Id: Ia17ee19054f6689f85e3423e83c1f47a2cc4364f
(cherry picked from commit 4a6ee98d39ab2300b2cd17c60221e43bf4ade8e7)

8 years agoRun setup for full tests only once. [DO NOT MERGE]
Deepanshu Gupta [Sat, 9 May 2015 20:33:55 +0000 (13:33 -0700)]
Run setup for full tests only once. [DO NOT MERGE]

Change-Id: Iee64dbd88d473b7be08581f26ccddf649aed8e56
(cherry picked from commit a12ec8f1e28cb5a8601bf606852f1d34d7c91996)

8 years agoLayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]
Deepanshu Gupta [Wed, 29 Jul 2015 01:27:28 +0000 (18:27 -0700)]
LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

Change-Id: I0d3ee6fd5a4656156a630d3b298533ea13eb8415
(cherry picked from commit 6e8d8ad2b7cffed751b2a382ac7b761954767188)

8 years agoLayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]
Deepanshu Gupta [Mon, 27 Jul 2015 18:50:43 +0000 (11:50 -0700)]
LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

If the color value for status bar or navigation bar is declared directly
in the theme (i.e. doesn't reference a color resource via @color/foo),
the ResourceType for the attribute is not assigned by the IDE. LayoutLib
used to ignore resources that were not of type color. This change fixes
the issue by also checking the resources without a type.

Change-Id: I94735ec225415282db06ab9db5c3233ad89c052f
(cherry picked from commit e3f9834ebd8a6e4ee155c8e4c9456dfc98e8b832)

8 years agoSet support flag for custom layouts for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Thu, 23 Jul 2015 23:40:23 +0000 (16:40 -0700)]
Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

Change-Id: I3a0349c0482ae45e226b2016a0f24707c85edff4
(cherry picked from commit f7712d3524309c365b68f93497771084e6b5a66b)

8 years agoLayoutLib: translucent sys ui bars [DO NOT MERGE]
Deepanshu Gupta [Thu, 23 Jul 2015 18:35:25 +0000 (11:35 -0700)]
LayoutLib: translucent sys ui bars [DO NOT MERGE]

Change-Id: I9c294329fc78418c505a5115bc9c07da29595af2
(cherry picked from commit fc8f4aad7395eca11f6d9b82eb266b1f4ee5041b)

8 years agoUpdate nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Wed, 13 May 2015 23:56:42 +0000 (16:56 -0700)]
Update nav bar icons. [DO NOT MERGE]

- Add a script to copy the icons from the original source.
- Update layout used for the navigation bar to be closer to the original
  layout.
- Update test image with the latest rendering.
- Add a nexus 5 landscape device config to help with testing.

Change-Id: I0b6674955e0970a6a8cce148b1b7aa61e1752ccd
(cherry picked from commit 139d6ff12d395a888624113fdd2521861b47d761)

8 years agoMove the layout code out of RenderSessionImpl. [DO NOT MERGE]
Deepanshu Gupta [Wed, 22 Jul 2015 01:27:40 +0000 (18:27 -0700)]
Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

Also, switch to using a RelativeLayout from a LinearLayout. The change
will help in future when enabling transparent status and nav bar.

Change-Id: Ie4db5d28313f1c5ef775603788598a56409f92c7
(cherry picked from commit b1484862e2367d87d3ccbd0fd0a6d2598ed5918a)

8 years agoCalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]
Deepanshu Gupta [Fri, 17 Jul 2015 01:32:54 +0000 (18:32 -0700)]
CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

Not all attr are added to R.attr. This results in some attr not being
found and hence a broken rendering. Fix the issue by adding all attr
referenced in R.styleable to the map of attr before adding any remaining
values from R.attr.

Change-Id: I1ebf8a394b9e1edbf7490e011833d20a00d38317
(cherry picked from commit e8018480dbefc896bd26e5eedfdde802ce3731a7)

8 years agoAdd tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]
Deepanshu Gupta [Sat, 11 Jul 2015 00:38:29 +0000 (17:38 -0700)]
Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

Store a list of drawer layouts with tools:openDrawer encountered and
call openDrawer on them during the post-inflation processing.

Change-Id: Idee299a9af1bb106509a03bb2e8424c372b93dc5
(cherry picked from commit ccbc11770397888cf7780925bb4c7cf1d2f2f80e)

8 years agoChange tools:list_item to listitem. [DO NOT MERGE]
Deepanshu Gupta [Wed, 8 Jul 2015 19:47:46 +0000 (12:47 -0700)]
Change tools:list_item to listitem. [DO NOT MERGE]

The listitem is already in use for ListView. Reuse the same attribute
for RecyclerView rather than creating a new one.

Change-Id: I82aabe7d04fbe3e61645bc427a81c14c454d03c5
(cherry picked from commit 111dc04a28f0181bf429e5ded9024d3fdff7be50)

8 years agoImplement tools:list_item for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Tue, 7 Jul 2015 01:31:20 +0000 (18:31 -0700)]
Implement tools:list_item for RecyclerView. [DO NOT MERGE]

It's now possible to use tools:list_item attribute for RecyclerView to
point to a default layout, rather than always using a TextView.

Change-Id: I5d522b2f0ca38b420fddfcb0f73a26d95707da79
(cherry picked from commit 61f23e9bf7d784e7a52168196758c4f6c6853e77)

8 years agoSupport AppBar from Material Design. [DO NOT MERGE]
Jens Ole Lauridsen [Fri, 5 Jun 2015 15:04:27 +0000 (08:04 -0700)]
Support AppBar from Material Design. [DO NOT MERGE]

This CL is a start for making the design able to render the AppBar.
We are still missing support for: system menu and the app icon.

Change-Id: I19600f8ee1e7e6492186a0b7ae7fb38c82e15c02
(cherry picked from commit 4dfe4d43ce5634f059a3ba669e3cac4551c3a3ee)

8 years agoUpdate tests per new layoutlib_api [DO NOT MERGE]
Deepanshu Gupta [Tue, 7 Jul 2015 01:26:41 +0000 (18:26 -0700)]
Update tests per new layoutlib_api [DO NOT MERGE]

Change-Id: Idc89ffceaf171abcf2b579f4e934b514ef209210
(cherry picked from commit d7b846c1814de34f2cea8507907f70618ec7cae0)

8 years agoAdd missing resolveResValue call. [DO NOT MERGE]
Deepanshu Gupta [Tue, 30 Jun 2015 21:28:58 +0000 (14:28 -0700)]
Add missing resolveResValue call. [DO NOT MERGE]

Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
(cherry picked from commit 5d1eaf4a197130f561b16c4ed083cf016b20ab92)

8 years agoLayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Mon, 1 Jun 2015 21:21:24 +0000 (14:21 -0700)]
LayoutLib: Skip classes from java package. [DO NOT MERGE]

Classes in "java" package can't be defined at runtime anyway. No use
including them in LayoutLib.

Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73
(cherry picked from commit 86caef1892e1ce063e0e880396c8deaa3a6a171d)

8 years agoSkip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Wed, 27 May 2015 19:35:56 +0000 (12:35 -0700)]
Skip warnings for some unresolved references. [DO NOT MERGE]

Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.

Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.

Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
(cherry picked from commit b3e872be9e634c8d1f34d07778ea753880bbf2d9)

8 years agoFix import order. [DO NOT MERGE]
Deepanshu Gupta [Fri, 13 Mar 2015 22:24:59 +0000 (15:24 -0700)]
Fix import order. [DO NOT MERGE]

Change-Id: I50bfbf4011290683a1c6adb94e0b6fa301dcc75b
(cherry picked from commit b9b8aef94e5bad8f5f03f686a2d3d8a09c045a7b)

8 years agoFix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Sat, 30 May 2015 00:00:34 +0000 (17:00 -0700)]
Fix ParserFactory not initialized error. [DO NOT MERGE]

Bug: http://b.android.com/175129
Change-Id: I2111673767e0f62ee910560022b559a177d55abd
(cherry picked from commit 996458b76c944f78eee26d7bd8cb4d39303b9119)

8 years agoFix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Thu, 28 May 2015 19:33:04 +0000 (12:33 -0700)]
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

Replace direct member access with getter that checks for nullness.

Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
(cherry picked from commit d758e042ce08c46712db3db2d63fc84795028dfe)

8 years agoFix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 27 May 2015 23:57:10 +0000 (16:57 -0700)]
Fix BridgeTypedArray.getType() [DO NOT MERGE]

Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.

Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
(cherry picked from commit 5779ad71eabed3aabaefef1e4749693f8320816e)

8 years agoInclude Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 26 May 2015 16:24:48 +0000 (09:24 -0700)]
Include Shapes in LayoutLib. [DO NOT MERGE]

Change-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08
(cherry picked from commit 59164ec0551aa49f497acca81222f304cf4f344b)

8 years agoLayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Fri, 22 May 2015 22:47:16 +0000 (15:47 -0700)]
LayoutLib: Support getting resource arrays. [DO NOT MERGE]

- Don't crash when Resources.get<Type>Array() is called.
- If the IDE supports it, actually return the value.
- Add tests for getArray.
- Update test app to latest gradle plugin version.
- Switch to using AppTheme for tests, since the tests depend on some
  custom theme attributes. The AppTheme now inherits from
  Material.Light.DarkActionBar, so other tests should be unaffected.

Depends on a newer version of sdk-common, which fixes the parsing of
array resource in value files.

Bug: 12372031
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
(cherry picked from commit 642cff50f8f7a67eed09eac1e56d7133b26a192c)

8 years agoLayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Fri, 22 May 2015 21:11:22 +0000 (14:11 -0700)]
LayoutLib: Change nullity annotations. [DO NOT MERGE]

Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).

A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.

Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
(cherry picked from commit 476e582d2ffdf25102d4c55f8c242baa3d21d37f)

8 years agoAdd documentation about hack in commit: f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 21 May 2015 18:47:36 +0000 (11:47 -0700)]
Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
(cherry picked from commit 6330971ed293a2777bbdab09288f90ea4b2d0255)

8 years agoMake DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Mon, 24 Aug 2015 20:50:18 +0000 (13:50 -0700)]
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

Only cherry picked for the style not found fix.

Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
(cherry picked from commit d5b82845450beac2d3c7db9cd80e9fc34d43a297)

8 years agoInject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 20 May 2015 21:51:37 +0000 (14:51 -0700)]
Inject anonymous inner classes of injected classes [DO NOT MERGE]

When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.

Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
(cherry picked from commit bfc9c3bcbe3b7056d3330f754811c1506f181b88)