commit 37e3f4fdd47d6d964aaef344a00b4c424550440d
author Colin Cross <ccross@android.com> Mon May 24 21:31:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 24 21:31:24 2021 +0000
tree 5412e42117c53dec0b6e5e077149a132aa743257
parent 13043ca8a8c76f92fc6d15a52acf2b9945f7ed1a
parent 1baf87ef4d54f6ee66846c865fbee3b5a981d8b1

Don't use WallpaperPicker2 BuildCompat am: 1baf87ef4d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/1715851

Change-Id: Ia518deaa5e5a1b39e15f44aeccb5a0267b409db9

src/com/android/customization/picker/CustomizationPickerActivity.java

diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index 786bebd..c97a8eb 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -19,6 +19,7 @@
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;
@@ -59,7 +60,6 @@
 import com.android.customization.picker.theme.ThemeFragment.ThemeFragmentHost;
 import com.android.customization.widget.NoTintDrawableWrapper;
 import com.android.wallpaper.R;
-import com.android.wallpaper.compat.BuildCompat;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.DailyLoggingAlarmScheduler;
 import com.android.wallpaper.module.FormFactorChecker;
@@ -213,7 +213,7 @@
 
     private void initSections() {
         mSections.clear();
-        if (!BuildCompat.isAtLeastQ()) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             Log.d(TAG, "Build version < Q detected");
             return;
         }