Remove the bottom action bar from the wallpaper selecting page (3/3)
Bug: 185308659
Test: manual
Change-Id: Id371d9216a9433dfd65287cb74cefb3aaad547a9
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();
}