commit 8cbe49ffb2086bc047bf088d525dd203d0c542d5
author Chuck Liao <chuckliao@google.com> Mon Mar 15 20:28:04 2021 +0800
committer Chuck Liao <chuckliao@google.com> Thu Mar 18 20:40:09 2021 +0800
tree fb587ebbc889c3248a2859edef9a789a97735b1a
parent 3bc70f31636259d8fec55bef6d421a37448d7237

Let the wallpaper category list page(CategorySelectorFragment) can be attached to not only fragment but also activity independently.

Bug: 181299737
Test: Manual
Change-Id: Ie72bf73726b87eef4494df0268edfc0236d2fc22

src/com/android/wallpaper/picker/TopLevelPickerActivity.java

diff --git a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
index 77bbd58..e8f1ab6 100755
--- a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
+++ b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
@@ -238,8 +238,7 @@
             return;
         }
 
-        CategoryFragment categoryFragment = getCategoryFragment();
-        if (categoryFragment != null && categoryFragment.popChildFragment()) {
+        if (fragment != null && fragment.getChildFragmentManager().popBackStackImmediate()) {
             return;
         }
         super.onBackPressed();
@@ -650,12 +649,13 @@
 
     @Override
     @Nullable
-    public CategoryFragment getCategoryFragment() {
+    public CategorySelectorFragment getCategorySelectorFragment() {
         if (mDelegate.getFormFactor() != FormFactorChecker.FORM_FACTOR_MOBILE) {
             return null;
         }
         FragmentManager fm = getSupportFragmentManager();
-        return (CategoryFragment) fm.findFragmentById(R.id.fragment_container);
+        return ((CategoryFragment) fm.findFragmentById(
+                R.id.fragment_container)).getCategorySelectorFragment();
     }
 
     /**