commit 3d9784b78345692c7a966d324d9d5e5c54ab3772
author Xin Li <delphij@google.com> Thu Oct 07 23:50:08 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 07 23:50:08 2021 +0000
tree 274d05deb79e730858852cf60892187105409ef8
parent de6e0af62a05a41300b865edc883f531074ef0a1
parent 5fcfa1230751c2120566ac74795abbc3b63514e2

Merge "Merge Android 12"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6982fc2..09fde31 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,6 +41,7 @@
             android:theme="@style/LivePickerTheme"
             android:colorMode="wideColorGamut"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:hardwareAccelerated="true">
             <intent-filter>
                 <action android:name="android.service.wallpaper.LIVE_WALLPAPER_CHOOSER" />
@@ -55,6 +56,7 @@
             android:label="@string/live_wallpaper_preview_title"
             android:colorMode="wideColorGamut"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:theme="@style/Preview">
             <intent-filter>
                 <action android:name="android.service.wallpaper.CHANGE_LIVE_WALLPAPER" />

src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java

diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index fbae006..c346d13 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -32,6 +32,7 @@
 import android.content.res.Resources.NotFoundException;
 import android.graphics.Outline;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -84,7 +85,7 @@
 
     private static final String LOG_TAG = "LiveWallpaperPreview";
 
-    private static final boolean SHOW_DUMMY_DATA = false;
+    private static final boolean SHOW_FAKE_DATA = false;
 
     private WallpaperManager mWallpaperManager;
     private WallpaperConnection mWallpaperConnection;
@@ -190,7 +191,7 @@
         setWallpaperButton.setOnClickListener(this::setLiveWallpaper);
         mPages.add(Pair.create(getString(R.string.tab_info), pageInfo));
 
-        if (SHOW_DUMMY_DATA) {
+        if (SHOW_FAKE_DATA) {
             attributionTitle.setText("Diorama, Yosemite");
             attributionTitle.setVisibility(View.VISIBLE);
             attributionAuthor.setText("Live Earth Collection - Android Earth");
@@ -629,6 +630,12 @@
             }
         }
 
+        @Override
+        public void onLocalWallpaperColorsChanged(RectF area,
+                WallpaperColors colors, int displayId) {
+
+        }
+
         public void onServiceConnected(ComponentName name, IBinder service) {
             if (mWallpaperConnection == this) {
                 mService = IWallpaperService.Stub.asInterface(service);