Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ab95353 authored by Jim Shargo's avatar Jim Shargo Committed by Android (Google) Code Review
Browse files

Merge "Revert "[WPP logging] Wire logThemedIconApplied (1/2)"" into main

parents 9d559d4c 5d289d7f

src/com/android/customization/model/themedicon/ThemedIconSectionController.java

+1 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import androidx.lifecycle.Observer; 


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 @@ public class ThemedIconSectionController implements 
    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 @@ public class ThemedIconSectionController implements 
            ThemedIconSwitchProvider themedIconOptionsProvider,

            ThemedIconInteractor interactor,

            @Nullable Bundle savedInstanceState,

            ThemedIconSnapshotRestorer snapshotRestorer,

            ThemesUserEventLogger themesUserEventLogger) {

            ThemedIconSnapshotRestorer snapshotRestorer) {

        mThemedIconOptionsProvider = themedIconOptionsProvider;

        mInteractor = interactor;

        mSnapshotRestorer = snapshotRestorer;
@@ -58,7 +55,6 @@ public class ThemedIconSectionController implements 
                mThemedIconSectionView.getSwitch().setChecked(isActivated);

            }

        };

        mThemesUserEventLogger = themesUserEventLogger;



        if (savedInstanceState != null) {

            mSavedThemedIconEnabled = savedInstanceState.getBoolean(
@@ -95,7 +91,6 @@ public class ThemedIconSectionController implements 
        }

        mThemedIconOptionsProvider.setThemedIconEnabled(viewActivated);

        mInteractor.setActivated(viewActivated);

        mThemesUserEventLogger.logThemedIconApplied(viewActivated);

        mSnapshotRestorer.store(viewActivated);

    }

src/com/android/customization/module/DefaultCustomizationSections.java

+2 −7
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ import com.android.customization.model.themedicon.ThemedIconSectionController; 
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 @@ public final class DefaultCustomizationSections implements CustomizationSections 
    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 @@ public final class DefaultCustomizationSections implements CustomizationSections 
            DarkModeSnapshotRestorer darkModeSnapshotRestorer,

            ThemedIconSnapshotRestorer themedIconSnapshotRestorer,

            ThemedIconInteractor themedIconInteractor,

            ColorPickerInteractor colorPickerInteractor,

            ThemesUserEventLogger themesUserEventLogger) {

            ColorPickerInteractor colorPickerInteractor) {

        mColorPickerViewModelFactory = colorPickerViewModelFactory;

        mKeyguardQuickAffordancePickerViewModelFactory =

                keyguardQuickAffordancePickerViewModelFactory;
@@ -85,7 +82,6 @@ public final class DefaultCustomizationSections implements CustomizationSections 
        mThemedIconSnapshotRestorer = themedIconSnapshotRestorer;

        mThemedIconInteractor = themedIconInteractor;

        mColorPickerInteractor = colorPickerInteractor;

        mThemesUserEventLogger = themesUserEventLogger;

    }



    @Override
@@ -192,8 +188,7 @@ public final class DefaultCustomizationSections implements CustomizationSections 
                                ThemedIconSwitchProvider.getInstance(activity),

                                mThemedIconInteractor,

                                savedInstanceState,

                                mThemedIconSnapshotRestorer,

                                mThemesUserEventLogger));

                                mThemedIconSnapshotRestorer));



                // App grid section.

                sectionControllers.add(

src/com/android/customization/module/ThemePickerInjector.kt

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ internal constructor( 
                    getThemedIconSnapshotRestorer(activity),

                    getThemedIconInteractor(),

                    getColorPickerInteractor(activity, getWallpaperColorsRepository()),

                    getUserEventLogger(activity.applicationContext),

                )

                .also { customizationSections = it }

    }