diff options
| author | Jon Miranda <jonmiranda@google.com> | 2019-04-16 20:53:24 -0700 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2019-04-19 15:13:10 -0700 |
| commit | de0093dfa5e5ffe128a64ad7b767b6b3e650473b (patch) | |
| tree | c696ad8c300a0fded0c6d1cd888b4d6c9ca3f304 /src/com/android/launcher3/AbstractFloatingView.java | |
| parent | 0f8c7c0e91c7d5edb4193e436ad1d2a5671bb96c (diff) | |
| download | android_packages_apps_Trebuchet-de0093dfa5e5ffe128a64ad7b767b6b3e650473b.tar.gz android_packages_apps_Trebuchet-de0093dfa5e5ffe128a64ad7b767b6b3e650473b.tar.bz2 android_packages_apps_Trebuchet-de0093dfa5e5ffe128a64ad7b767b6b3e650473b.zip | |
Add ListenerView so that we can fast finish the FloatingIconView fade anim.
This change allows us to quickly end the animation if the user begins
interacting with launcher before the animation is over. This can currently
happen when the user swipes up to go home, and then quickly swipes up again
to enter overview.
Bug: 129421279
Change-Id: I88c7d55ef8ac09f999c082317de3bb3693c11466
Diffstat (limited to 'src/com/android/launcher3/AbstractFloatingView.java')
| -rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index 0e082760a..3cb6ba67f 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -30,6 +30,7 @@ import android.util.AttributeSet; import android.util.Pair; import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.widget.LinearLayout; import androidx.annotation.IntDef; @@ -58,6 +59,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch TYPE_ON_BOARD_POPUP, TYPE_DISCOVERY_BOUNCE, TYPE_SNACKBAR, + TYPE_LISTENER, TYPE_TASK_MENU, TYPE_OPTIONS_POPUP @@ -72,15 +74,16 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_ON_BOARD_POPUP = 1 << 5; public static final int TYPE_DISCOVERY_BOUNCE = 1 << 6; public static final int TYPE_SNACKBAR = 1 << 7; + public static final int TYPE_LISTENER = 1 << 8; // Popups related to quickstep UI - public static final int TYPE_TASK_MENU = 1 << 8; - public static final int TYPE_OPTIONS_POPUP = 1 << 9; + public static final int TYPE_TASK_MENU = 1 << 9; + public static final int TYPE_OPTIONS_POPUP = 1 << 10; public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_TASK_MENU - | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR; + | TYPE_OPTIONS_POPUP | TYPE_SNACKBAR | TYPE_LISTENER; // Type of popups which should be kept open during launcher rebind public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET @@ -90,7 +93,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_SNACKBAR; - public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE; + public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER; // These view all have particular operation associated with swipe down interaction. public static final int TYPE_STATUS_BAR_SWIPE_DOWN_DISALLOW = TYPE_WIDGETS_BOTTOM_SHEET | |