summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-07 23:50:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-07 23:50:08 +0000
commit3d9784b78345692c7a966d324d9d5e5c54ab3772 (patch)
tree274d05deb79e730858852cf60892187105409ef8 /src
parentde6e0af62a05a41300b865edc883f531074ef0a1 (diff)
parent5fcfa1230751c2120566ac74795abbc3b63514e2 (diff)
downloadplatform_packages_wallpapers_LivePicker-master.tar.gz
platform_packages_wallpapers_LivePicker-master.tar.bz2
platform_packages_wallpapers_LivePicker-master.zip
Merge "Merge Android 12"HEADmaster
Diffstat (limited to 'src')
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java11
1 files changed, 9 insertions, 2 deletions
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.pm.PackageManager;
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 @@ public class LiveWallpaperPreview extends Activity {
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 @@ public class LiveWallpaperPreview extends Activity {
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 @@ public class LiveWallpaperPreview extends Activity {
}
}
+ @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);