Remove SystemUISharedLib dependency from ThemePicker (69f2efba) · Commits · e / os / android_packages_apps_ThemePicker

Android.mk

+3 −8

Original line number	Diff line number	Diff line
		@@ -26,14 +26,9 @@ LOCAL_USE_AAPT2 := true
		LOCAL_MODULE_TAGS := optional

		LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib

		LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano
		LOCAL_PROGUARD_ENABLED := disabled

		ifneq (,$(wildcard frameworks/base))
		LOCAL_PRIVATE_PLATFORM_APIS := true
		else
		LOCAL_SDK_VERSION := system_current
		endif

		LOCAL_PACKAGE_NAME := ThemePicker
		LOCAL_PRIVILEGED_MODULE := true

+5 −5

Original line number	Diff line number	Diff line
		@@ -15,12 +15,14 @@
		*/
		package com.android.customization.module;

		import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_COLOR;
		import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_FONT;
		import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SHAPE;

		import android.stats.style.nano.StyleEnums;
		import android.util.Log;

		import androidx.annotation.Nullable;

		import com.android.systemui.shared.system.StatsLogCompat;
		import com.android.customization.model.clock.Clockface;
		import com.android.customization.model.grid.GridOption;
		import com.android.customization.model.theme.ThemeBundle;
		@@ -29,9 +31,7 @@ import com.android.wallpaper.module.NoOpUserEventLogger;
		import java.util.Map;
		import java.util.Objects;

		import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_COLOR;
		import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_FONT;
		import static com.android.customization.model.ResourceConstants.OVERLAY_CATEGORY_SHAPE;


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