diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-14 01:19:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-14 01:19:30 +0000 |
| commit | 7d351d9b7eb6c070556d5536fba55d649ca339cf (patch) | |
| tree | 274d05deb79e730858852cf60892187105409ef8 | |
| parent | 834c218b593df89999f4211ba53958a55e942844 (diff) | |
| parent | ec35ce1a3fa4f77244e7d4b6d56f4fbb2d4d4060 (diff) | |
| download | platform_packages_wallpapers_LivePicker-sdk-release.tar.gz platform_packages_wallpapers_LivePicker-sdk-release.tar.bz2 platform_packages_wallpapers_LivePicker-sdk-release.zip | |
Merge "Snap for 7821744 from 3d9784b78345692c7a966d324d9d5e5c54ab3772 to sdk-release" into sdk-releasesdk-release
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 11 |
2 files changed, 11 insertions, 2 deletions
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" /> 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); |