diff options
| author | 2018-08-10 12:06:16 -0700 | |
|---|---|---|
| committer | 2018-08-10 15:36:31 -0700 | |
| commit | 381fa2c7df7881a59387007d2d6418c6a5c78f86 (patch) | |
| tree | 62569193e414a59cf63a71ade584d77c4be7a1aa | |
| parent | 88ee680e4c8cd8f66d6117f74caf5324244cc316 (diff) | |
Move bg.argb constant to TileUtils.
Bug: 110405144
Test: rebuild
Change-Id: I79d84c1c8cc052dadf3175ceef2f93c0ef3e2e14
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java | 6 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java index f39b85105b9e..e2c8ecdb2a30 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java @@ -126,6 +126,12 @@ public class TileUtils { */ public static final String META_DATA_PREFERENCE_ICON_BACKGROUND_HINT = "com.android.settings.bg.hint"; + /** + * Name of the meta-data item that should be set in the AndroidManifest.xml + * to specify the icon background color as raw ARGB. + */ + public static final String META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB = + "com.android.settings.bg.argb"; /** * Name of the meta-data item that should be set in the AndroidManifest.xml diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java index 914d1828981e..dde17462a6f9 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java @@ -54,7 +54,7 @@ public class SettingsLibRobolectricTestRunner extends RobolectricTestRunner { final List<ResourcePath> paths = super.getIncludedResourcePaths(); paths.add(resourcePath("file:frameworks/base/packages/SettingsLib/res")); paths.add(resourcePath("file:frameworks/base/core/res/res")); - paths.add(resourcePath("file:frameworks/support/appcompat/res")); + paths.add(resourcePath("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.appcompat_appcompat-nodeps/android_common/aar/res/")); return paths; } }; |