Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84a333c7 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Hide WallpaperService.Engine colors API." into oc-dr1-dev am: 1133cf2b 

am: edc2917b

Change-Id: Id25fbbca90dbac2b4149c5aaa6ca3d3ee4c8b537
parents 42e76119 edc2917b

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -37584,12 +37584,10 @@ package android.service.wallpaper { 
    method public int getDesiredMinimumHeight();

    method public int getDesiredMinimumWidth();

    method public android.view.SurfaceHolder getSurfaceHolder();

    method public void invalidateColors();

    method public boolean isPreview();

    method public boolean isVisible();

    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 onComputeWallpaperColors();

    method public void onCreate(android.view.SurfaceHolder);

    method public void onDesiredSizeChanged(int, int);

    method public void onDestroy();

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -40803,12 +40803,10 @@ package android.service.wallpaper { 
    method public int getDesiredMinimumHeight();

    method public int getDesiredMinimumWidth();

    method public android.view.SurfaceHolder getSurfaceHolder();

    method public void invalidateColors();

    method public boolean isPreview();

    method public boolean isVisible();

    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 onComputeWallpaperColors();

    method public void onCreate(android.view.SurfaceHolder);

    method public void onDesiredSizeChanged(int, int);

    method public void onDestroy();

api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -37792,12 +37792,10 @@ package android.service.wallpaper { 
    method public int getDesiredMinimumHeight();

    method public int getDesiredMinimumWidth();

    method public android.view.SurfaceHolder getSurfaceHolder();

    method public void invalidateColors();

    method public boolean isPreview();

    method public boolean isVisible();

    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 onComputeWallpaperColors();

    method public void onCreate(android.view.SurfaceHolder);

    method public void onDesiredSizeChanged(int, int);

    method public void onDestroy();

core/java/android/service/wallpaper/WallpaperService.java

+2 −0
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ public abstract class WallpaperService extends Service { 
        /**

         * Notifies the engine that wallpaper colors changed significantly.

         * This will trigger a {@link #onComputeWallpaperColors()} call.

         * @hide

         */

        public void invalidateColors() {

            try {
@@ -564,6 +565,7 @@ public abstract class WallpaperService extends Service { 
         * you might want to call {@link #invalidateColors()} in a near future.

         *

         * @return List of wallpaper colors and their weights.

         * @hide

         */

        public @Nullable WallpaperColors onComputeWallpaperColors() {

            return null;