Revert "[WPP logging] Wire logThemedIconApplied (1/2)"
Revert submission 25095962-themed-icon-log
Reason for revert: broke the build
Reverted changes: /q/submissionid:25095962-themed-icon-log
Change-Id: Ibc8df96091907ddce9e043de51f671de41c05d83
diff --git a/src/com/android/customization/model/themedicon/ThemedIconSectionController.java b/src/com/android/customization/model/themedicon/ThemedIconSectionController.java
index 6c738c7..5d551a6 100644
--- a/src/com/android/customization/model/themedicon/ThemedIconSectionController.java
+++ b/src/com/android/customization/model/themedicon/ThemedIconSectionController.java
@@ -24,7 +24,6 @@
import com.android.customization.model.themedicon.domain.interactor.ThemedIconInteractor;
import com.android.customization.model.themedicon.domain.interactor.ThemedIconSnapshotRestorer;
-import com.android.customization.module.logging.ThemesUserEventLogger;
import com.android.customization.picker.themedicon.ThemedIconSectionView;
import com.android.wallpaper.R;
import com.android.wallpaper.model.CustomizationSectionController;
@@ -39,7 +38,6 @@
private final ThemedIconInteractor mInteractor;
private final ThemedIconSnapshotRestorer mSnapshotRestorer;
private final Observer<Boolean> mIsActivatedChangeObserver;
- private final ThemesUserEventLogger mThemesUserEventLogger;
private ThemedIconSectionView mThemedIconSectionView;
private boolean mSavedThemedIconEnabled = false;
@@ -48,8 +46,7 @@
ThemedIconSwitchProvider themedIconOptionsProvider,
ThemedIconInteractor interactor,
@Nullable Bundle savedInstanceState,
- ThemedIconSnapshotRestorer snapshotRestorer,
- ThemesUserEventLogger themesUserEventLogger) {
+ ThemedIconSnapshotRestorer snapshotRestorer) {
mThemedIconOptionsProvider = themedIconOptionsProvider;
mInteractor = interactor;
mSnapshotRestorer = snapshotRestorer;
@@ -58,7 +55,6 @@
mThemedIconSectionView.getSwitch().setChecked(isActivated);
}
};
- mThemesUserEventLogger = themesUserEventLogger;
if (savedInstanceState != null) {
mSavedThemedIconEnabled = savedInstanceState.getBoolean(
@@ -95,7 +91,6 @@
}
mThemedIconOptionsProvider.setThemedIconEnabled(viewActivated);
mInteractor.setActivated(viewActivated);
- mThemesUserEventLogger.logThemedIconApplied(viewActivated);
mSnapshotRestorer.store(viewActivated);
}
diff --git a/src/com/android/customization/module/DefaultCustomizationSections.java b/src/com/android/customization/module/DefaultCustomizationSections.java
index c507dd9..460a848 100644
--- a/src/com/android/customization/module/DefaultCustomizationSections.java
+++ b/src/com/android/customization/module/DefaultCustomizationSections.java
@@ -14,7 +14,6 @@
import com.android.customization.model.themedicon.ThemedIconSwitchProvider;
import com.android.customization.model.themedicon.domain.interactor.ThemedIconInteractor;
import com.android.customization.model.themedicon.domain.interactor.ThemedIconSnapshotRestorer;
-import com.android.customization.module.logging.ThemesUserEventLogger;
import com.android.customization.picker.clock.ui.view.ClockViewFactory;
import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel;
import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor;
@@ -59,7 +58,6 @@
private final ThemedIconSnapshotRestorer mThemedIconSnapshotRestorer;
private final ThemedIconInteractor mThemedIconInteractor;
private final ColorPickerInteractor mColorPickerInteractor;
- private final ThemesUserEventLogger mThemesUserEventLogger;
public DefaultCustomizationSections(
ColorPickerViewModel.Factory colorPickerViewModelFactory,
@@ -72,8 +70,7 @@
DarkModeSnapshotRestorer darkModeSnapshotRestorer,
ThemedIconSnapshotRestorer themedIconSnapshotRestorer,
ThemedIconInteractor themedIconInteractor,
- ColorPickerInteractor colorPickerInteractor,
- ThemesUserEventLogger themesUserEventLogger) {
+ ColorPickerInteractor colorPickerInteractor) {
mColorPickerViewModelFactory = colorPickerViewModelFactory;
mKeyguardQuickAffordancePickerViewModelFactory =
keyguardQuickAffordancePickerViewModelFactory;
@@ -85,7 +82,6 @@
mThemedIconSnapshotRestorer = themedIconSnapshotRestorer;
mThemedIconInteractor = themedIconInteractor;
mColorPickerInteractor = colorPickerInteractor;
- mThemesUserEventLogger = themesUserEventLogger;
}
@Override
@@ -192,8 +188,7 @@
ThemedIconSwitchProvider.getInstance(activity),
mThemedIconInteractor,
savedInstanceState,
- mThemedIconSnapshotRestorer,
- mThemesUserEventLogger));
+ mThemedIconSnapshotRestorer));
// App grid section.
sectionControllers.add(
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index 8433a7c..74e28b2 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -145,7 +145,6 @@
getThemedIconSnapshotRestorer(activity),
getThemedIconInteractor(),
getColorPickerInteractor(activity, getWallpaperColorsRepository()),
- getUserEventLogger(activity.applicationContext),
)
.also { customizationSections = it }
}