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

Commit 085e8c90 authored by Colin Cross's avatar Colin Cross
Browse files

Fix WindowManagerShell for use_resource_processor: true 

Reference resources with the package name specified in the manifest of
the library that contains the resources.

Bug: 294256649
Test: m javac-check
Change-Id: I33127868f32632e7a83e37a595401bb26ba85e40
parent 3c1dd6f9

libs/WindowManager/Shell/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -172,4 +172,5 @@ android_library { 
    kotlincflags: ["-Xjvm-default=all"],

    manifest: "AndroidManifest.xml",

    plugins: ["dagger2-compiler"],

    use_resource_processor: true,

}

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

+6 −3
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ public class BubbleController implements ConfigurationChangeListener, 
        mBubbleIconFactory = new BubbleIconFactory(context,

                context.getResources().getDimensionPixelSize(R.dimen.bubble_size),

                context.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size),

                context.getResources().getColor(R.color.important_conversation),

                context.getResources().getColor(

                        com.android.launcher3.icons.R.color.important_conversation),

                context.getResources().getDimensionPixelSize(

                        com.android.internal.R.dimen.importance_ring_stroke_width));

        mDisplayController = displayController;
@@ -949,7 +950,8 @@ public class BubbleController implements ConfigurationChangeListener, 
        mBubbleIconFactory = new BubbleIconFactory(mContext,

                mContext.getResources().getDimensionPixelSize(R.dimen.bubble_size),

                mContext.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size),

                mContext.getResources().getColor(R.color.important_conversation),

                mContext.getResources().getColor(

                        com.android.launcher3.icons.R.color.important_conversation),

                mContext.getResources().getDimensionPixelSize(

                        com.android.internal.R.dimen.importance_ring_stroke_width));
@@ -988,7 +990,8 @@ public class BubbleController implements ConfigurationChangeListener, 
                mBubbleIconFactory = new BubbleIconFactory(mContext,

                        mContext.getResources().getDimensionPixelSize(R.dimen.bubble_size),

                        mContext.getResources().getDimensionPixelSize(R.dimen.bubble_badge_size),

                        mContext.getResources().getColor(R.color.important_conversation),

                        mContext.getResources().getColor(

                                com.android.launcher3.icons.R.color.important_conversation),

                        mContext.getResources().getDimensionPixelSize(

                                com.android.internal.R.dimen.importance_ring_stroke_width));

                mStackView.onDisplaySizeChanged();

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleOverflow.kt

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class BubbleOverflow(private val context: Context, private val positioner: Bubbl 
                context,

                res.getDimensionPixelSize(R.dimen.bubble_size),

                res.getDimensionPixelSize(R.dimen.bubble_badge_size),

                res.getColor(R.color.important_conversation),

                res.getColor(com.android.launcher3.icons.R.color.important_conversation),

                res.getDimensionPixelSize(com.android.internal.R.dimen.importance_ring_stroke_width)

            )