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

Merge "Correctly show the widget in the recommendation table" into tm-qpr-dev am: e53245fbc7

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

Change-Id: I2efd1a4602c31fc64ef41d00a7d4499bf112100a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sihua Ma
2022-10-26 18:52:15 +00:00
committed by Automerger Merge Worker
parent e2207e072e e53245fbc7
commit 9525bb2b1d
2 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
-24
View File
@@ -92,10 +92,6 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView
// The following member variables are only used during drag-n-drop.
private boolean mIsInDragMode = false;
/** The drag content width which is only set when the drag content scale is not 1f. */
private int mDragContentWidth = 0;
/** The drag content height which is only set when the drag content scale is not 1f. */
private int mDragContentHeight = 0;
private boolean mTrackingWidgetUpdate = false;
@@ -314,27 +310,9 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView
}
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
if (mIsInDragMode && mDragContentWidth > 0 && mDragContentHeight > 0
&& getChildCount() == 1) {
measureChild(getChildAt(0), MeasureSpec.getSize(mDragContentWidth),
MeasureSpec.getSize(mDragContentHeight));
}
}
/** Starts the drag mode. */
public void startDrag() {
mIsInDragMode = true;
// In the case of dragging a scaled preview from widgets picker, we should reuse the
// previously measured dimension from WidgetCell#measureAndComputeWidgetPreviewScale, which
// measures the dimension of a widget preview without its parent's bound before scaling
// down.
if ((getScaleX() != 1f || getScaleY() != 1f) && getChildCount() == 1) {
mDragContentWidth = getChildAt(0).getMeasuredWidth();
mDragContentHeight = getChildAt(0).getMeasuredHeight();
}
}
/** Handles a drag event occurred on a workspace page corresponding to the {@code screenId}. */
@@ -347,8 +325,6 @@ public class LauncherAppWidgetHostView extends BaseLauncherAppWidgetHostView
/** Ends the drag mode. */
public void endDrag() {
mIsInDragMode = false;
mDragContentWidth = 0;
mDragContentHeight = 0;
requestLayout();
}
src/com/android/launcher3/widget/WidgetCell.java
+57 -5
View File
@@ -284,6 +284,40 @@ public class WidgetCell extends LinearLayout {
ensurePreviewWithCallback(callback, cachedPreview);
}
private static class ScaledAppWidgetHostView extends LauncherAppWidgetHostView {
private boolean mKeepOrigForDragging = true;
ScaledAppWidgetHostView(Context context) {
super(context);
}
/**
* Set if the view will keep its original scale when dragged
* @param isKeepOrig True if keep original scale when dragged, false otherwise
*/
public void setKeepOrigForDragging(boolean isKeepOrig) {
mKeepOrigForDragging = isKeepOrig;
}
/**
* @return True if the view is set to preserve original scale when dragged, false otherwise
*/
public boolean isKeepOrigForDragging() {
return mKeepOrigForDragging;
}
@Override
public void startDrag() {
super.startDrag();
if (!isKeepOrigForDragging()) {
// restore to original scale when being dragged, if set to do so
setScaleToFit(1.0f);
}
// When the drag start, translations need to be set to zero to center the view
setTranslationForCentering(0f, 0f);
}
}
private void applyPreviewOnAppWidgetHostView(WidgetItem item) {
if (mRemoteViewsPreview != null) {
mAppWidgetHostViewPreview = createAppWidgetHostView(getContext());
@@ -299,7 +333,7 @@ public class WidgetCell extends LinearLayout {
// a preview during drag & drop. And thus, we should use LauncherAppWidgetHostView, which
// supports applying local color extraction during drag & drop.
mAppWidgetHostViewPreview = isLauncherContext(context)
? new LauncherAppWidgetHostView(context)
? new ScaledAppWidgetHostView(context)
: createAppWidgetHostView(context);
LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo =
LauncherAppWidgetProviderInfo.fromProviderInfo(context, item.widgetInfo.clone());
@@ -398,23 +432,41 @@ public class WidgetCell extends LinearLayout {
int containerWidth = (int) (mTargetPreviewWidth * mPreviewContainerScale);
int containerHeight = (int) (mTargetPreviewHeight * mPreviewContainerScale);
setContainerSize(containerWidth, containerHeight);
boolean shouldMeasureAndScale = false;
if (mAppWidgetHostViewPreview.getChildCount() == 1) {
View widgetContent = mAppWidgetHostViewPreview.getChildAt(0);
ViewGroup.LayoutParams layoutParams = widgetContent.getLayoutParams();
// We only scale preview if both the width & height of the outermost view group are
// not set to MATCH_PARENT.
boolean shouldScale =
shouldMeasureAndScale =
layoutParams.width != MATCH_PARENT && layoutParams.height != MATCH_PARENT;
if (shouldScale) {
if (shouldMeasureAndScale) {
setNoClip(mWidgetImageContainer);
setNoClip(mAppWidgetHostViewPreview);
mAppWidgetHostViewScale = measureAndComputeWidgetPreviewScale();
mAppWidgetHostViewPreview.setScaleToFit(mAppWidgetHostViewScale);
}
}
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
containerWidth, containerHeight, Gravity.FILL);
mTargetPreviewWidth, mTargetPreviewHeight, Gravity.FILL);
mAppWidgetHostViewPreview.setLayoutParams(params);
if (!shouldMeasureAndScale
&& mAppWidgetHostViewPreview instanceof ScaledAppWidgetHostView) {
// If the view is not measured & scaled, at least one side will match the grid size,
// so it should be safe to restore the original scale once it is dragged.
ScaledAppWidgetHostView tempView =
(ScaledAppWidgetHostView) mAppWidgetHostViewPreview;
tempView.setKeepOrigForDragging(false);
tempView.setScaleToFit(mPreviewContainerScale);
} else if (!shouldMeasureAndScale) {
mAppWidgetHostViewPreview.setScaleToFit(mPreviewContainerScale);
} else {
mAppWidgetHostViewPreview.setScaleToFit(mAppWidgetHostViewScale);
}
mAppWidgetHostViewPreview.setTranslationForCentering(
-(params.width - (params.width * mPreviewContainerScale)) / 2.0f,
-(params.height - (params.height * mPreviewContainerScale)) / 2.0f);
mWidgetImageContainer.addView(mAppWidgetHostViewPreview, /* index= */ 0);
mWidgetImage.setVisibility(View.GONE);
applyPreview(null);