commit f333dadbfc8ee12ca41f88fd76edb2b357b451a1
author Amin Shaikh <ashaikh@google.com> Thu May 09 14:35:20 2019 -0700
committer Amin Shaikh <ashaikh@google.com> Thu May 09 14:39:27 2019 -0700
tree 4a61cb69f4bbeba0fbc18572f595685a7dd49594
parent 355ced9b92514b14581253207ffe29e07ddb4678

Do not finish activity onBackPressed.

Fixes: 132282437
Test: open app, tap back, enter through overview
Change-Id: Ie6d7f30a58429521c3a5c03f95410c1035189713

src/com/android/customization/picker/CustomizationPickerActivity.java

diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index c20b73f..8759dab 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -266,6 +266,17 @@
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        if (getSupportFragmentManager().popBackStackImmediate()) {
+            return;
+        }
+        if (moveTaskToBack(false)) {
+            return;
+        }
+        super.onBackPressed();
+    }
+
     private void navigateToSection(@IdRes int id) {
         mBottomNav.setSelectedItemId(id);
     }