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

Commit 45bdf7a0 authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Wrapping various apply parameters into a separate class" into... 

Merge "Wrapping various apply parameters into a separate class" into tm-qpr-dev am: b4b3a8bd am: b4b25e4f

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



Change-Id: Ic6e6eda7ce96c0df0da665af0e32f75610981d08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45bbdf2d b4b25e4f

core/java/android/appwidget/AppWidgetHostView.java

+11 −5
Original line number Original line Diff line number Diff line
@@ -103,7 +103,6 @@ public class AppWidgetHostView extends FrameLayout { 
    private boolean mOnLightBackground;

    private boolean mOnLightBackground;

    private SizeF mCurrentSize = null;

    private SizeF mCurrentSize = null;

    private RemoteViews.ColorResources mColorResources = null;

    private RemoteViews.ColorResources mColorResources = null;

    private SparseIntArray mColorMapping = null;

    // Stores the last remote views last inflated.

    // Stores the last remote views last inflated.

    private RemoteViews mLastInflatedRemoteViews = null;

    private RemoteViews mLastInflatedRemoteViews = null;

    private long mLastInflatedRemoteViewsId = -1;

    private long mLastInflatedRemoteViewsId = -1;
@@ -900,11 +899,19 @@ public class AppWidgetHostView extends FrameLayout { 
     * {@link android.R.color#system_neutral1_500}.

     * {@link android.R.color#system_neutral1_500}.

     */

     */

    public void setColorResources(@NonNull SparseIntArray colorMapping) {

    public void setColorResources(@NonNull SparseIntArray colorMapping) {

        if (mColorMapping != null && isSameColorMapping(mColorMapping, colorMapping)) {

        if (mColorResources != null

                && isSameColorMapping(mColorResources.getColorMapping(), colorMapping)) {

            return;

            return;

        }

        }

        mColorMapping = colorMapping.clone();

        setColorResources(RemoteViews.ColorResources.create(mContext, colorMapping));

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

    }



    /** @hide **/

    public void setColorResources(RemoteViews.ColorResources colorResources) {

        if (colorResources == mColorResources) {

            return;

        }

        mColorResources = colorResources;

        mColorMappingChanged = true;

        mColorMappingChanged = true;

        mViewMode = VIEW_MODE_NOINIT;

        mViewMode = VIEW_MODE_NOINIT;

        reapplyLastRemoteViews();

        reapplyLastRemoteViews();
@@ -934,7 +941,6 @@ public class AppWidgetHostView extends FrameLayout { 
    public void resetColorResources() {

    public void resetColorResources() {

        if (mColorResources != null) {

        if (mColorResources != null) {

            mColorResources = null;

            mColorResources = null;

            mColorMapping = null;

            mColorMappingChanged = true;

            mColorMappingChanged = true;

            mViewMode = VIEW_MODE_NOINIT;

            mViewMode = VIEW_MODE_NOINIT;

            reapplyLastRemoteViews();

            reapplyLastRemoteViews();

core/java/android/widget/RemoteViews.java

+193 −178

File changed.

Preview size limit exceeded, changes collapsed.