summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Poultney <poultney@google.com>2023-03-03 14:23:56 +0000
committerChris Poultney <poultney@google.com>2023-03-03 17:26:50 +0000
commitbf0a87de404d656f62d49df6c254873236ba0dc1 (patch)
tree828591210c7851f47cd50ff38bc0ae745f1ab334
parent0ae2cf08650f3f378ac9a41c3d32b73e0b9b3e99 (diff)
downloadWallpaperPicker2-bf0a87de404d656f62d49df6c254873236ba0dc1.tar.gz
Prevents undo logic from executing when new hub UI is disabled
Bug: 270997324 Test: n/a Change-Id: Ib7b89df1a13fb248c7b880aef903f362df9a84c5
-rw-r--r--src/com/android/wallpaper/picker/CustomizationPickerActivity.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/wallpaper/picker/CustomizationPickerActivity.java b/src/com/android/wallpaper/picker/CustomizationPickerActivity.java
index 31579ef6..1ed7272e 100644
--- a/src/com/android/wallpaper/picker/CustomizationPickerActivity.java
+++ b/src/com/android/wallpaper/picker/CustomizationPickerActivity.java
@@ -52,7 +52,6 @@ import com.android.wallpaper.picker.AppbarFragment.AppbarFragmentHost;
import com.android.wallpaper.picker.CategorySelectorFragment.CategorySelectorFragmentHost;
import com.android.wallpaper.picker.MyPhotosStarter.PermissionChangedListener;
import com.android.wallpaper.picker.individual.IndividualPickerFragment.IndividualPickerFragmentHost;
-import com.android.wallpaper.picker.undo.domain.interactor.UndoInteractor;
import com.android.wallpaper.util.ActivityUtils;
import com.android.wallpaper.util.DeepLinkUtils;
import com.android.wallpaper.util.LaunchUtils;
@@ -79,7 +78,6 @@ public class CustomizationPickerActivity extends FragmentActivity implements App
private BottomActionBar mBottomActionBar;
private boolean mIsSafeToCommitFragmentTransaction;
- @Nullable private UndoInteractor mUndoInteractor;
private boolean mIsUseRevampedUi;
@Override
@@ -133,8 +131,9 @@ public class CustomizationPickerActivity extends FragmentActivity implements App
if (savedInstanceState == null) {
// We only want to start a new undo session if this activity is brand-new. A non-new
// activity will have a non-null savedInstanceState.
- mUndoInteractor = injector.getUndoInteractor(this);
- mUndoInteractor.startSession();
+ if (mIsUseRevampedUi) {
+ injector.getUndoInteractor(this).startSession();
+ }
}
final Intent intent = getIntent();