diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-21 23:02:02 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-21 23:02:02 +0000 |
| commit | 42291220492be6aa18c2d142ab5663580892ce9b (patch) | |
| tree | 7a06fd0ef29fed85c683f350cc5c09571fe7521b /src/com/android/launcher3/allapps | |
| parent | 0874711c87a721064feeade71352aab72c984f28 (diff) | |
| parent | 52c1b66f46eb4764825f87d4be07c62cd650935c (diff) | |
| download | android_packages_apps_Trebuchet-42291220492be6aa18c2d142ab5663580892ce9b.tar.gz android_packages_apps_Trebuchet-42291220492be6aa18c2d142ab5663580892ce9b.tar.bz2 android_packages_apps_Trebuchet-42291220492be6aa18c2d142ab5663580892ce9b.zip | |
[automerger] Go back to previous state when hitting back from discovery bounce am: 52c1b66f46
Change-Id: Ib979caee1d57bb92aa4de96a9587c0307799a3d1
Diffstat (limited to 'src/com/android/launcher3/allapps')
| -rw-r--r-- | src/com/android/launcher3/allapps/DiscoveryBounce.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/allapps/DiscoveryBounce.java b/src/com/android/launcher3/allapps/DiscoveryBounce.java index 4c0ac92dd..6b0438498 100644 --- a/src/com/android/launcher3/allapps/DiscoveryBounce.java +++ b/src/com/android/launcher3/allapps/DiscoveryBounce.java @@ -84,6 +84,14 @@ public class DiscoveryBounce extends AbstractFloatingView { } @Override + public boolean onBackPressed() { + super.onBackPressed(); + // Go back to the previous state (from a user's perspective this floating view isn't + // something to go back from). + return false; + } + + @Override public boolean onControllerInterceptTouchEvent(MotionEvent ev) { handleClose(false); return false; |