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

Commit 0768fb09 authored by George Lin's avatar George Lin Committed by Android (Google) Code Review
Browse files

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

parents e0c5f710 540bf2a9

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

+6 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 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;
@@ -38,6 +39,7 @@ 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;
@@ -46,7 +48,8 @@ public class ThemedIconSectionController implements 
            ThemedIconSwitchProvider themedIconOptionsProvider,

            ThemedIconInteractor interactor,

            @Nullable Bundle savedInstanceState,

            ThemedIconSnapshotRestorer snapshotRestorer) {

            ThemedIconSnapshotRestorer snapshotRestorer,

            ThemesUserEventLogger themesUserEventLogger) {

        mThemedIconOptionsProvider = themedIconOptionsProvider;

        mInteractor = interactor;

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

            }

        };

        mThemesUserEventLogger = themesUserEventLogger;



        if (savedInstanceState != null) {

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

        mThemedIconOptionsProvider.setThemedIconEnabled(viewActivated);

        mInteractor.setActivated(viewActivated);

        mThemesUserEventLogger.logThemedIconApplied(viewActivated);

        mSnapshotRestorer.store(viewActivated);

    }

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

+7 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 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;
@@ -56,6 +57,7 @@ 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,
@@ -67,7 +69,8 @@ public final class DefaultCustomizationSections implements CustomizationSections 
            ClockViewFactory clockViewFactory,

            ThemedIconSnapshotRestorer themedIconSnapshotRestorer,

            ThemedIconInteractor themedIconInteractor,

            ColorPickerInteractor colorPickerInteractor) {

            ColorPickerInteractor colorPickerInteractor,

            ThemesUserEventLogger themesUserEventLogger) {

        mColorPickerViewModelFactory = colorPickerViewModelFactory;

        mKeyguardQuickAffordancePickerViewModelFactory =

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

        mThemedIconInteractor = themedIconInteractor;

        mColorPickerInteractor = colorPickerInteractor;

        mThemesUserEventLogger = themesUserEventLogger;

    }



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

                                mThemedIconInteractor,

                                savedInstanceState,

                                mThemedIconSnapshotRestorer));

                                mThemedIconSnapshotRestorer,

                                mThemesUserEventLogger));



                // App grid section.

                sectionControllers.add(

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

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

                    getThemedIconInteractor(),

                    getColorPickerInteractor(appContext, getWallpaperColorsRepository()),

                    getUserEventLogger(appContext),

                )

                .also { customizationSections = it }

    }