PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6b5a25b9e64d5c0712fdb4529fe7b181ade5bbf4
This commit is contained in:
Steven Ng
2021-06-18 09:17:07 +00:00
committed by Automerger Merge Worker
parent b78b27cb1d be397e85e8
commit d50c07ea41
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+4 -12
View File
@@ -16,9 +16,6 @@
package com.android.launcher3.widget; 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.appwidget.AppWidgetProviderInfo;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
@@ -51,6 +48,7 @@ import com.android.launcher3.R;
import com.android.launcher3.Utilities; import com.android.launcher3.Utilities;
import com.android.launcher3.Workspace; import com.android.launcher3.Workspace;
import com.android.launcher3.dragndrop.DragLayer; 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.ItemInfo;
import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo;
import com.android.launcher3.util.Executors; import com.android.launcher3.util.Executors;
@@ -102,7 +100,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
private final Rect mCurrentWidgetSize = new Rect(); private final Rect mCurrentWidgetSize = new Rect();
private final Rect mWidgetSizeAtDrag = new Rect(); private final Rect mWidgetSizeAtDrag = new Rect();
private final float[] mTmpFloatArray = new float[4];
private final RectF mTempRectF = new RectF(); private final RectF mTempRectF = new RectF();
private final Rect mEnforcedRectangle = new Rect(); private final Rect mEnforcedRectangle = new Rect();
private final float mEnforcedCornerRadius; private final float mEnforcedCornerRadius;
@@ -117,6 +114,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
} }
}; };
private final Object mUpdateLock = new Object(); private final Object mUpdateLock = new Object();
private final ViewGroupFocusHelper mDragLayerRelativeCoordinateHelper;
private long mDeferUpdatesUntilMillis = 0; private long mDeferUpdatesUntilMillis = 0;
private RemoteViews mMostRecentRemoteViews; private RemoteViews mMostRecentRemoteViews;
@@ -137,6 +135,7 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
mColorExtractor.setListener(this); mColorExtractor.setListener(this);
mEnforcedCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(getContext()); mEnforcedCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(getContext());
mDragLayerRelativeCoordinateHelper = new ViewGroupFocusHelper(mLauncher.getDragLayer());
} }
@Override @Override
@@ -325,15 +324,9 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
mIsScrollable = checkScrollableRecursively(this); mIsScrollable = checkScrollableRecursively(this);
if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) { if (!mIsInDragMode && getTag() instanceof LauncherAppWidgetInfo) {
mCurrentWidgetSize.left = left;
mCurrentWidgetSize.right = right;
mCurrentWidgetSize.top = top;
mCurrentWidgetSize.bottom = bottom;
LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag(); LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
getBoundsForViewInDragLayer(mLauncher.getDragLayer(), (View) getParent(), mDragLayerRelativeCoordinateHelper.viewToRect(this, mCurrentWidgetSize);
mCurrentWidgetSize, true, mTmpFloatArray, mTempRectF);
setRect(mTempRectF, mCurrentWidgetSize);
updateColorExtraction(mCurrentWidgetSize, updateColorExtraction(mCurrentWidgetSize,
mWorkspace.getPageIndexForScreenId(info.screenId)); mWorkspace.getPageIndexForScreenId(info.screenId));
} }
@@ -358,7 +351,6 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
mIsInDragMode = false; mIsInDragMode = false;
mDragListener = null; mDragListener = null;
mWidgetSizeAtDrag.setEmpty(); mWidgetSizeAtDrag.setEmpty();
requestLayout();
} }
/** /**