diff options
author | Tony Wickham <twickham@google.com> | 2018-04-12 17:26:18 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2018-04-12 17:26:18 -0700 |
commit | df1eb8bb86cbf3eddba54f9f78718ab6e5734185 (patch) | |
tree | 68d686b354d05f754086d285d58e6d8f2e30c76d /src | |
parent | 2998e43256d2c41059507a9fb9debee4cd8e41e5 (diff) | |
download | packages_apps_Trebuchet-df1eb8bb86cbf3eddba54f9f78718ab6e5734185.tar.gz packages_apps_Trebuchet-df1eb8bb86cbf3eddba54f9f78718ab6e5734185.tar.bz2 packages_apps_Trebuchet-df1eb8bb86cbf3eddba54f9f78718ab6e5734185.zip |
Don't show back button when discovery bounce is playing
Bug: 74766552
Change-Id: Ib3b514f4a2bfaa8593b82cd5acb16f02dd09dcc7
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index b0c5baf6b..693cf3137 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -70,6 +70,9 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET | TYPE_QUICKSTEP_PREVIEW | TYPE_ON_BOARD_POPUP; + // Usually we show the back button when a floating view is open. Instead, hide for these types. + public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP; + protected boolean mIsOpen; public AbstractFloatingView(Context context, AttributeSet attrs) { @@ -170,6 +173,11 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch } public static AbstractFloatingView getTopOpenView(BaseDraggingActivity activity) { - return getOpenView(activity, TYPE_ALL); + return getTopOpenViewWithType(activity, TYPE_ALL); + } + + public static AbstractFloatingView getTopOpenViewWithType(BaseDraggingActivity activity, + @FloatingViewType int type) { + return getOpenView(activity, type); } } |