diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-21 23:11:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-21 23:11:56 +0000 |
| commit | 52cb0a73a4d15e60974f784cedca48e0438d6b16 (patch) | |
| tree | 619566a4b5c126f28a172e4a1aff96a6adb059e6 /src/com/android/launcher3/AbstractFloatingView.java | |
| parent | bd6fba9f589d02550c7542afa1906e2e3dd82a1b (diff) | |
| parent | 52c1b66f46eb4764825f87d4be07c62cd650935c (diff) | |
Merge "Go back to previous state when hitting back from discovery bounce" into ub-launcher3-edmonton
Diffstat (limited to 'src/com/android/launcher3/AbstractFloatingView.java')
| -rw-r--r-- | src/com/android/launcher3/AbstractFloatingView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index c1f083d130..c75509eaba 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -123,9 +123,11 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch protected abstract boolean isOfType(@FloatingViewType int type); - public void onBackPressed() { + /** @return Whether the back is consumed. If false, Launcher will handle the back as well. */ + public boolean onBackPressed() { logActionCommand(Action.Command.BACK); close(true); + return true; } @Override |