Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e3b2f1c authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Removing SettingsLib dependency from WMShell" into sc-dev am: 74602f1b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14035877

Change-Id: Iac8033fe4b6cd59d5c9584932f494ec1ab7f48cb
parents bab20835 74602f1b

libs/WindowManager/Shell/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -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",

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

packages/SettingsLib/res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>