commit 6bf1cf403a563f9a9a1aae9b4de789f24963dcd5
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 26 19:58:50 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 26 19:58:50 2020 +0000
tree 2952a40c9bc592a87e907d3fafc9c9a47429052e
parent 19120bff1665a961359ede45140e0907ae79150b
parent 453fe2fb6e11ef2b6dca57a6467155d7640c0617

Merge "Hide clock option when there is only 1 option[1/2]" into ub-launcher3-master

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 60647d9..7da0d74 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -293,6 +293,9 @@
 
     @Override
     public void onBackPressed() {
+        if (mWallpaperCategoryFragment != null && mWallpaperCategoryFragment.popChildFragment()) {
+            return;
+        }
         if (getSupportFragmentManager().popBackStackImmediate()) {
             return;
         }
@@ -332,14 +335,6 @@
         mDelegate.showViewOnlyPreview(wallpaperInfo);
     }
 
-    /**
-     * Shows the picker activity for the given category.
-     */
-    @Override
-    public void show(String collectionId) {
-        mDelegate.show(collectionId);
-    }
-
     @Override
     public void onWallpapersReady() {