From 52c1b66f46eb4764825f87d4be07c62cd650935c Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Mon, 21 May 2018 13:13:58 -0700 Subject: Go back to previous state when hitting back from discovery bounce Normally when you hit back, we just close the floating view if there is one. This makes less sense for DiscoveryBounce, since it doesn't feel like a different state even though it's technically a floating view. So in that case, don't consume the back press; let launcher handle it to go to the previous state. Bug: 80075741 Change-Id: I7270b61be70509cb2101400a12929478a5d082aa --- src/com/android/launcher3/folder/Folder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/com/android/launcher3/folder') diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index b49952f15..6b13da70c 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -1437,12 +1437,13 @@ public class Folder extends AbstractFloatingView implements DragSource, } @Override - public void onBackPressed() { + public boolean onBackPressed() { if (isEditingName()) { mFolderName.dispatchBackKey(); } else { super.onBackPressed(); } + return true; } @Override -- cgit v1.2.3