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

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

Merge "[WPP logging] Wire logDarkThemeApplied" into main

parents 8ec27664 53349e9f

src/com/android/customization/model/mode/DarkModeSectionController.java

+6 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import androidx.lifecycle.Lifecycle; 
import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;



import com.android.customization.module.logging.ThemesUserEventLogger;

import com.android.customization.picker.mode.DarkModeSectionView;

import com.android.wallpaper.R;

import com.android.wallpaper.model.CustomizationSectionController;
@@ -60,16 +61,19 @@ public class DarkModeSectionController implements 
    private Context mContext;

    private DarkModeSectionView mDarkModeSectionView;

    private final DarkModeSnapshotRestorer mSnapshotRestorer;

    private final ThemesUserEventLogger mThemesUserEventLogger;



    public DarkModeSectionController(

            Context context,

            Lifecycle lifecycle,

            DarkModeSnapshotRestorer snapshotRestorer) {

            DarkModeSnapshotRestorer snapshotRestorer,

            ThemesUserEventLogger themesUserEventLogger) {

        mContext = context;

        mLifecycle = lifecycle;

        mPowerManager = context.getSystemService(PowerManager.class);

        mLifecycle.addObserver(this);

        mSnapshotRestorer = snapshotRestorer;

        mThemesUserEventLogger = themesUserEventLogger;

    }



    @OnLifecycleEvent(Lifecycle.Event.ON_START)
@@ -137,6 +141,7 @@ public class DarkModeSectionController implements 
                    mDarkModeSectionView.announceForAccessibility(

                            context.getString(R.string.mode_changed));

                    uiModeManager.setNightModeActivated(viewActivated);

                    mThemesUserEventLogger.logDarkThemeApplied(viewActivated);

                    mSnapshotRestorer.store(viewActivated);

                },

                /* delayMillis= */ shortDelay);

src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt

+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ class ColorPickerFragment : AppbarFragment() { 
            DarkModeSectionController(

                    context,

                    lifecycle,

                    injector.getDarkModeSnapshotRestorer(requireContext())

                    injector.getDarkModeSnapshotRestorer(requireContext()),

                    injector.getUserEventLogger(requireContext()),

                )

                .createView(requireContext())

        darkModeSectionView.background = null