diff options
| author | 2021-03-30 09:42:19 -0700 | |
|---|---|---|
| committer | 2021-03-30 11:08:10 -0700 | |
| commit | dcdee33ceb3e418098807711a1a54085c18c82cc (patch) | |
| tree | 240db085a54ee876b1d53811b7cbf448ead1f0b9 | |
| parent | 8ec8ca25386b1512d6623b6166c0c3c5b9437447 (diff) | |
Removing SettingsLib dependency from WMShell
Bug: 161980186
Test: Presubmit
Change-Id: I4cbdbd75b08c24649e7ce3c03f30425f1b2a5fea
| -rw-r--r-- | libs/WindowManager/Shell/Android.bp | 4 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/colors.xml | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index 3f03302de474..18f019dc949b 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -118,14 +118,14 @@ android_library { "androidx.appcompat_appcompat", "androidx.arch.core_core-runtime", "androidx.dynamicanimation_dynamicanimation", + "androidx.recyclerview_recyclerview", "kotlinx-coroutines-android", "kotlinx-coroutines-core", "iconloader_base", "jsr330", "protolog-lib", - "SettingsLib", "WindowManager-Shell-proto", - "jsr330" + "jsr330", ], kotlincflags: ["-Xjvm-default=enable"], manifest: "AndroidManifest.xml", diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java index 2d9da215efb7..fe3f9ef6aa5f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java @@ -93,7 +93,7 @@ public class BubbleIconFactory extends BaseIconFactory { final float ringStrokeWidth = mContext.getResources().getDimensionPixelSize( com.android.internal.R.dimen.importance_ring_stroke_width); final int importantConversationColor = mContext.getResources().getColor( - com.android.settingslib.R.color.important_conversation, null); + R.color.important_conversation, null); Bitmap badgeAndRing = Bitmap.createBitmap(userBadgedBitmap.getWidth(), userBadgedBitmap.getHeight(), userBadgedBitmap.getConfig()); Canvas c = new Canvas(badgeAndRing); diff --git a/packages/SettingsLib/res/values/colors.xml b/packages/SettingsLib/res/values/colors.xml index 88c6185a53e7..5e8779fa289a 100644 --- a/packages/SettingsLib/res/values/colors.xml +++ b/packages/SettingsLib/res/values/colors.xml @@ -39,7 +39,4 @@ <color name="dark_mode_icon_color_single_tone">#99000000</color> <color name="light_mode_icon_color_single_tone">#ffffff</color> - - <!-- Yellow 600, used for highlighting "important" conversations in settings & notifications --> - <color name="important_conversation">#f9ab00</color> </resources> |