commit d4df41b78f354d8c1ccdb476e3b20fbe1c66b69a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 21 20:46:37 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 21 20:46:37 2021 +0000
tree b5a25e6eedda8f92a18e8a7c63e57fe351567272
parent a293a864a67918f1e581534cb481943f375f8b4d
parent 4067f5d4ae56de4da704e771eb97be42bff6ee60

Merge "Bugfix where the widget handles appear even when you can't resize it." into sc-v2-dev

src/com/android/launcher3/AppWidgetResizeFrame.java

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 1bfd7b5..300f22b 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -241,13 +241,15 @@
         // Only show resize handles for the directions in which resizing is possible.
         InvariantDeviceProfile idp = LauncherAppState.getIDP(cellLayout.getContext());
         mVerticalResizeActive = (info.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0
-                && mMinVSpan < idp.numRows && mMaxVSpan > 1;
+                && mMinVSpan < idp.numRows && mMaxVSpan > 1
+                && mMinVSpan < mMaxVSpan;
         if (!mVerticalResizeActive) {
             mDragHandles[INDEX_TOP].setVisibility(GONE);
             mDragHandles[INDEX_BOTTOM].setVisibility(GONE);
         }
         mHorizontalResizeActive = (info.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0
-                && mMinHSpan < idp.numColumns && mMaxHSpan > 1;
+                && mMinHSpan < idp.numColumns && mMaxHSpan > 1
+                && mMinHSpan < mMaxHSpan;
         if (!mHorizontalResizeActive) {
             mDragHandles[INDEX_LEFT].setVisibility(GONE);
             mDragHandles[INDEX_RIGHT].setVisibility(GONE);