commit b30a7c629994d34b9c8eb879d4c52295eba448eb
author Santiago Etchebehere <santie@google.com> Thu Aug 22 14:41:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 22 14:41:42 2019 -0700
tree 8f4ec9e6842e882a66fcaf1e159966c6e6132a0f
parent 69f2efbaae460c7378ce8c7121a4a5dc0304a363
parent 89d0d098f09e870297047d9b8db34bd0e60e3d47

Use CenterCropBitmapTask for theme wallpapers
am: 89d0d098f0

Change-Id: Ib0139da6d5d89276c3f4e4d4feba3559f7a8e73a

Android.mk

diff --git a/Android.mk b/Android.mk
index b75cd3d..23e2368 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,14 +26,9 @@
 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_SDK_VERSION := system_current
 
 LOCAL_PACKAGE_NAME := ThemePicker
 LOCAL_PRIVILEGED_MODULE := true
@@ -44,7 +39,7 @@
     $(call all-java-files-under, src) \
     $(call all-java-files-under, src_override)
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_MANIFEST_FILE := AndroidManifest.xml
 

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..f3db20e
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,2 @@
+[Hook Scripts]
+checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

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

diff --git a/src/com/android/customization/module/StatsLogUserEventLogger.java b/src/com/android/customization/module/StatsLogUserEventLogger.java
index 37c64ac..1d60bf2 100644
--- a/src/com/android/customization/module/StatsLogUserEventLogger.java
+++ b/src/com/android/customization/module/StatsLogUserEventLogger.java
@@ -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 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}.