commit 5572b98f941f4c0673d98712540673eaa5490f80
author Chuck Liao <chuckliao@google.com> Tue Apr 13 23:48:14 2021 +0800
committer Chuck Liao <chuckliao@google.com> Thu Apr 15 19:38:13 2021 +0800
tree f513d18d0b93b246b680a2701ad3a1914fa9be27
parent a72158199a9d4d2cc8b00e90622f6ff2ef499ed5

Remove the bottom action bar from the wallpaper selecting page (3/3)

Bug: 185308659
Test: manual
Change-Id: Id371d9216a9433dfd65287cb74cefb3aaad547a9

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 f58bec2..9069c36 100755
--- a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
+++ b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
@@ -79,8 +79,6 @@
 import com.android.wallpaper.picker.individual.IndividualPickerFragment;
 import com.android.wallpaper.util.ScreenSizeCalculator;
 import com.android.wallpaper.util.ThrowableAnalyzer;
-import com.android.wallpaper.widget.BottomActionBar;
-import com.android.wallpaper.widget.BottomActionBar.BottomActionBarHost;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback;
@@ -95,7 +93,7 @@
  */
 public class TopLevelPickerActivity extends BaseActivity implements WallpapersUiContainer,
         CurrentWallpaperBottomSheetPresenter, SetWallpaperErrorDialogFragment.Listener,
-        MyPhotosStarter, AppbarFragmentHost, CategoryFragmentHost, BottomActionBarHost {
+        MyPhotosStarter, AppbarFragmentHost, CategoryFragmentHost {
 
     private static final String TAG_SET_WALLPAPER_ERROR_DIALOG_FRAGMENT =
             "toplevel_set_wallpaper_error_dialog";
@@ -234,11 +232,6 @@
     @Override
     public void onBackPressed() {
         Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
-        if (fragment instanceof BottomActionBarFragment
-                && ((BottomActionBarFragment) fragment).onBackPressed()) {
-            return;
-        }
-
         if (fragment != null && fragment.getChildFragmentManager().popBackStackImmediate()) {
             return;
         }
@@ -799,11 +792,6 @@
     }
 
     @Override
-    public boolean isNavigationTabsContained() {
-        return false;
-    }
-
-    @Override
     public void fetchCategories() {
         mDelegate.initialize(!mDelegate.getCategoryProvider().isCategoriesFetched());
     }
@@ -1128,11 +1116,6 @@
     }
 
     @Override
-    public BottomActionBar getBottomActionBar() {
-        return findViewById(R.id.bottom_actionbar);
-    }
-
-    @Override
     public void onUpArrowPressed() {
         onBackPressed();
     }