commit dcdee33ceb3e418098807711a1a54085c18c82cc
author Sunny Goyal <sunnygoyal@google.com> Tue Mar 30 09:42:19 2021 -0700
committer Sunny Goyal <sunnygoyal@google.com> Tue Mar 30 11:08:10 2021 -0700
tree 240db085a54ee876b1d53811b7cbf448ead1f0b9
parent 8ec8ca25386b1512d6623b6166c0c3c5b9437447

Removing SettingsLib dependency from WMShell

Bug: 161980186
Test: Presubmit
Change-Id: I4cbdbd75b08c24649e7ce3c03f30425f1b2a5fea

libs/WindowManager/Shell/Android.bp

diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp
index 3f03302..18f019d 100644
--- a/libs/WindowManager/Shell/Android.bp
+++ b/libs/WindowManager/Shell/Android.bp
@@ -118,14 +118,14 @@
         "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",

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java

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 2d9da21..fe3f9ef 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 @@
             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);