summaryrefslogtreecommitdiff
path: root/src/com/android/launcher3/CellLayout.java
diff options
context:
space:
mode:
authorCharlie Anderson <charlander@google.com>2023-04-25 14:38:57 -0400
committerCharlie Anderson <charlander@google.com>2023-05-12 14:54:45 -0400
commit438d405aab391f5c515b89151544c6a9e853e430 (patch)
tree153dd6491e9b4fc791f588f09f13d73faae5193d /src/com/android/launcher3/CellLayout.java
parentfda9f3d4309672fb2f63ac72fb1d97cde00e31d2 (diff)
downloadLauncher3-438d405aab391f5c515b89151544c6a9e853e430.tar.gz
Adding a new Edit Mode LauncherState
- Edit Mode doesn't close after dragging / dropping an app - Edit Mode can be entered through options popup menu, Spring Loaded still entered by dragging items - Adds new onLeavingState call to launcher states to cleanup changes Bug: 279590398 Flag: MULTI_SELECT_EDIT_MODE Test: manually tested the new state with flag on/off Change-Id: If4550037f9659dcb8cd8b1943388d1ec5d55fa29
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r--src/com/android/launcher3/CellLayout.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 5163ede509..6763eafd28 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -18,6 +18,7 @@ package com.android.launcher3;
import static android.animation.ValueAnimator.areAnimatorsEnabled;
+import static com.android.launcher3.LauncherState.EDIT_MODE;
import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
import static com.android.launcher3.dragndrop.DraggableView.DRAGGABLE_ICON;
import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
@@ -571,7 +572,9 @@ public class CellLayout extends ViewGroup {
}
protected void updateBgAlpha() {
- mBackground.setAlpha((int) (mSpringLoadedProgress * 255));
+ if (!getWorkspace().mLauncher.isInState(EDIT_MODE)) {
+ mBackground.setAlpha((int) (mSpringLoadedProgress * 255));
+ }
}
/**