diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 20 |
4 files changed, 15 insertions, 11 deletions
diff --git a/api/current.txt b/api/current.txt index e14979785492..4bd6a3b95b00 100644 --- a/api/current.txt +++ b/api/current.txt @@ -37767,8 +37767,10 @@ package android.service.wallpaper { method public android.view.SurfaceHolder getSurfaceHolder(); method public boolean isPreview(); method public boolean isVisible(); + method public void notifyColorsChanged(); method public void onApplyWindowInsets(android.view.WindowInsets); method public android.os.Bundle onCommand(java.lang.String, int, int, int, android.os.Bundle, boolean); + method public android.app.WallpaperColors onComputeColors(); method public void onCreate(android.view.SurfaceHolder); method public void onDesiredSizeChanged(int, int); method public void onDestroy(); diff --git a/api/system-current.txt b/api/system-current.txt index f7a576e645f5..3b1589aa884a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -41096,8 +41096,10 @@ package android.service.wallpaper { method public android.view.SurfaceHolder getSurfaceHolder(); method public boolean isPreview(); method public boolean isVisible(); + method public void notifyColorsChanged(); method public void onApplyWindowInsets(android.view.WindowInsets); method public android.os.Bundle onCommand(java.lang.String, int, int, int, android.os.Bundle, boolean); + method public android.app.WallpaperColors onComputeColors(); method public void onCreate(android.view.SurfaceHolder); method public void onDesiredSizeChanged(int, int); method public void onDestroy(); diff --git a/api/test-current.txt b/api/test-current.txt index bd93e1b6407d..0fc02a400337 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -37977,8 +37977,10 @@ package android.service.wallpaper { method public android.view.SurfaceHolder getSurfaceHolder(); method public boolean isPreview(); method public boolean isVisible(); + method public void notifyColorsChanged(); method public void onApplyWindowInsets(android.view.WindowInsets); method public android.os.Bundle onCommand(java.lang.String, int, int, int, android.os.Bundle, boolean); + method public android.app.WallpaperColors onComputeColors(); method public void onCreate(android.view.SurfaceHolder); method public void onDesiredSizeChanged(int, int); method public void onDestroy(); diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index e4d3142ccefe..424967f0e011 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -547,12 +547,11 @@ public abstract class WallpaperService extends Service { /** * Notifies the engine that wallpaper colors changed significantly. - * This will trigger a {@link #onComputeWallpaperColors()} call. - * @hide + * This will trigger a {@link #onComputeColors()} call. */ - public void invalidateColors() { + public void notifyColorsChanged() { try { - mConnection.onWallpaperColorsChanged(onComputeWallpaperColors()); + mConnection.onWallpaperColorsChanged(onComputeColors()); } catch (RemoteException e) { Log.w(TAG, "Can't invalidate wallpaper colors because " + "wallpaper connection was lost", e); @@ -560,19 +559,18 @@ public abstract class WallpaperService extends Service { } /** - * Notifies the system about what colors the wallpaper is using. + * Called by the system when it needs to know what colors the wallpaper is using. * You might return null if no color information is available at the moment. In that case - * you might want to call {@link #invalidateColors()} in a near future. + * you might want to call {@link #notifyColorsChanged()} in a near future. * <p> - * The simplest way of creating A {@link android.app.WallpaperColors} object is by using + * The simplest way of creating a {@link android.app.WallpaperColors} object is by using * {@link android.app.WallpaperColors#fromBitmap(Bitmap)} or * {@link android.app.WallpaperColors#fromDrawable(Drawable)}, but you can also specify - * your main colors and dark text support explicitly using one of the constructors. + * your main colors by constructing a {@link android.app.WallpaperColors} object manually. * * @return Wallpaper colors. - * @hide */ - public @Nullable WallpaperColors onComputeWallpaperColors() { + public @Nullable WallpaperColors onComputeColors() { return null; } @@ -1212,7 +1210,7 @@ public abstract class WallpaperService extends Service { mEngine = engine; mActiveEngines.add(engine); engine.attach(this); - engine.invalidateColors(); + engine.notifyColorsChanged(); return; } case DO_DETACH: { |