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

Commit 64160c68 authored by George Lin's avatar George Lin
Browse files

Move logging related classes to logging package (1/3) 

Test: Build succeeded
Bug: 299659307
Change-Id: I9698c4e7df5bbb42b175431e6d5c972d929c66d4
parent 14f144a0

src/com/android/customization/model/grid/GridOptionsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import androidx.lifecycle.LiveData; 


import com.android.customization.model.CustomizationManager;

import com.android.customization.module.CustomizationInjector;

import com.android.customization.module.ThemesUserEventLogger;

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

import com.android.wallpaper.R;

import com.android.wallpaper.module.InjectorProvider;

import com.android.wallpaper.util.PreviewUtils;

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

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ import com.android.customization.model.themedicon.ThemedIconSwitchProvider 
import com.android.customization.model.themedicon.data.repository.ThemeIconRepository

import com.android.customization.model.themedicon.domain.interactor.ThemedIconInteractor

import com.android.customization.model.themedicon.domain.interactor.ThemedIconSnapshotRestorer

import com.android.customization.module.logging.StatsLogUserEventLogger

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

import com.android.customization.picker.clock.data.repository.ClockPickerRepositoryImpl

import com.android.customization.picker.clock.data.repository.ClockRegistryProvider

import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor
@@ -71,8 +73,8 @@ import com.android.wallpaper.dispatchers.MainDispatcher 
import com.android.wallpaper.model.WallpaperColorsRepository

import com.android.wallpaper.module.CustomizationSections

import com.android.wallpaper.module.FragmentFactory

import com.android.wallpaper.module.UserEventLogger

import com.android.wallpaper.module.WallpaperPicker2Injector

import com.android.wallpaper.module.logging.UserEventLogger

import com.android.wallpaper.picker.CustomizationPickerActivity

import com.android.wallpaper.picker.customization.data.content.WallpaperClientImpl

import com.android.wallpaper.picker.customization.data.repository.WallpaperRepository

src/com/android/customization/module/StatsLogUserEventLogger.java→src/com/android/customization/module/logging/StatsLogUserEventLogger.java

+3 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.customization.module;

package com.android.customization.module.logging;



import static com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__ACTION__APP_LAUNCHED;

import static com.android.systemui.shared.system.SysUiStatsLog.STYLE_UICHANGED__LAUNCHED_PREFERENCE__LAUNCHED_CROP_AND_SET_ACTION;
@@ -42,9 +42,10 @@ import androidx.annotation.Nullable; 


import com.android.customization.model.color.ColorOption;

import com.android.customization.model.grid.GridOption;

import com.android.wallpaper.module.NoOpUserEventLogger;

import com.android.customization.module.SysUiStatsLogger;

import com.android.wallpaper.module.WallpaperPreferences;

import com.android.wallpaper.module.WallpaperStatusChecker;

import com.android.wallpaper.module.logging.NoOpUserEventLogger;



/**

 * StatsLog-backed implementation of {@link ThemesUserEventLogger}.

src/com/android/customization/module/ThemesUserEventLogger.java→src/com/android/customization/module/logging/ThemesUserEventLogger.java

+4 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.customization.module;

package com.android.customization.module.logging;



import com.android.customization.model.color.ColorOption;

import com.android.customization.model.grid.GridOption;

import com.android.wallpaper.module.UserEventLogger;

import com.android.wallpaper.module.logging.UserEventLogger;



/**

 * Extension of {@link UserEventLogger} that adds ThemePicker specific events.
@@ -32,8 +32,10 @@ public interface ThemesUserEventLogger extends UserEventLogger { 
     */

    void logColorApplied(int action, ColorOption colorOption);



    /** */

    void logGridSelected(GridOption grid);



    /** */

    void logGridApplied(GridOption grid);



}

tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import android.content.res.Resources 
import androidx.activity.ComponentActivity

import com.android.customization.module.CustomizationInjector

import com.android.customization.module.CustomizationPreferences

import com.android.customization.module.ThemesUserEventLogger

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

import com.android.customization.picker.clock.domain.interactor.ClockPickerInteractor

import com.android.customization.picker.clock.ui.view.ClockViewFactory

import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel
@@ -17,7 +17,7 @@ import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel 
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor

import com.android.systemui.shared.clocks.ClockRegistry

import com.android.wallpaper.model.WallpaperColorsRepository

import com.android.wallpaper.module.UserEventLogger

import com.android.wallpaper.module.logging.UserEventLogger

import com.android.wallpaper.testing.TestInjector

import javax.inject.Inject

import javax.inject.Singleton