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

Commit 4554bcd1 authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille
Browse files

Correct invalidation of layout when new color resources are provided. 

The mViewMode variable is only used if there is no RemoteViews object.
But we still want to update the colors in that case.

Bug: 179783721
Test: atest CtsWidgetTestCases:android.widget.cts.RemoteViewsThemeColorsTest
Change-Id: I078d21422a6300e7aaecb0baa2a49b9e14cae9e9
parent c4bbeabb

core/java/android/appwidget/AppWidgetHostView.java

+2 −0
Original line number Diff line number Diff line
@@ -849,6 +849,7 @@ public class AppWidgetHostView extends FrameLayout { 
    public void setColorResources(@NonNull SparseIntArray colorMapping) {

        mColorResources = RemoteViews.ColorResources.create(mContext, colorMapping);

        mLayoutId = -1;

        mViewMode = VIEW_MODE_NOINIT;

        reapplyLastRemoteViews();

    }
@@ -863,6 +864,7 @@ public class AppWidgetHostView extends FrameLayout { 
        if (mColorResources != null) {

            mColorResources = null;

            mLayoutId = -1;

            mViewMode = VIEW_MODE_NOINIT;

            reapplyLastRemoteViews();

        }

    }