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

Commit cbec62d3 authored by Steven Ng's avatar Steven Ng Committed by Automerger Merge Worker
Browse files

Merge "Use relative bounds for app widget color extraction" into sc-dev am: be397e85 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15016211

Change-Id: I0aad84636553bd80252613c7df269448b094727e
parents ae7c8cac be397e85

src/com/android/launcher3/widget/LauncherAppWidgetHostView.java

+4 −12
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.launcher3.widget;



import static com.android.launcher3.Utilities.getBoundsForViewInDragLayer;

import static com.android.launcher3.Utilities.setRect;



import android.appwidget.AppWidgetProviderInfo;

import android.content.Context;

import android.content.res.Configuration;
@@ -51,6 +48,7 @@ import com.android.launcher3.R; 
import com.android.launcher3.Utilities;

import com.android.launcher3.Workspace;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.keyboard.ViewGroupFocusHelper;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.LauncherAppWidgetInfo;

import com.android.launcher3.util.Executors;
@@ -102,7 +100,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView 
    private final Rect mCurrentWidgetSize = new Rect();

    private final Rect mWidgetSizeAtDrag = new Rect();



    private final float[] mTmpFloatArray = new float[4];

    private final RectF mTempRectF = new RectF();

    private final Rect mEnforcedRectangle = new Rect();

    private final float mEnforcedCornerRadius;
@@ -117,6 +114,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView 
        }

    };

    private final Object mUpdateLock = new Object();

    private final ViewGroupFocusHelper mDragLayerRelativeCoordinateHelper;

    private long mDeferUpdatesUntilMillis = 0;

    private RemoteViews mMostRecentRemoteViews;
@@ -137,6 +135,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView 
        mColorExtractor.setListener(this);



        mEnforcedCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(getContext());

        mDragLayerRelativeCoordinateHelper = new ViewGroupFocusHelper(mLauncher.getDragLayer());

    }



    @Override
@@ -325,15 +324,9 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView 


        mIsScrollable = checkScrollableRecursively(this);

        if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {

            mCurrentWidgetSize.left = left;

            mCurrentWidgetSize.right = right;

            mCurrentWidgetSize.top = top;

            mCurrentWidgetSize.bottom = bottom;



            LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();

            getBoundsForViewInDragLayer(mLauncher.getDragLayer(), (View) getParent(),

                    mCurrentWidgetSize, true, mTmpFloatArray, mTempRectF);

            setRect(mTempRectF, mCurrentWidgetSize);

            mDragLayerRelativeCoordinateHelper.viewToRect(this, mCurrentWidgetSize);

            updateColorExtraction(mCurrentWidgetSize,

                    mWorkspace.getPageIndexForScreenId(info.screenId));

        }
@@ -358,7 +351,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView 
        mIsInDragMode = false;

        mDragListener = null;

        mWidgetSizeAtDrag.setEmpty();

        requestLayout();

    }



    /**