Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide WallpaperService.Engine colors API." into oc-dr1-dev

Browse Source 
am: 1133cf2b8a

Change-Id: I388496b56e078b49637e1edd80e9f0b2733f1c9b
This commit is contained in:
Lucas Dupin
2017-06-16 04:51:20 +00:00
committed by android-build-merger
parent 5f661f9484 1133cf2b8a
commit edc2917b69
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -37581,12 +37581,10 @@ package android.service.wallpaper {
method public int getDesiredMinimumHeight(); method public int getDesiredMinimumHeight();
method public int getDesiredMinimumWidth(); method public int getDesiredMinimumWidth();
method public android.view.SurfaceHolder getSurfaceHolder(); method public android.view.SurfaceHolder getSurfaceHolder();
method public void invalidateColors();
method public boolean isPreview(); method public boolean isPreview();
method public boolean isVisible(); method public boolean isVisible();
method public void onApplyWindowInsets(android.view.WindowInsets); 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.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 onCreate(android.view.SurfaceHolder);
method public void onDesiredSizeChanged(int, int); method public void onDesiredSizeChanged(int, int);
method public void onDestroy(); method public void onDestroy();

2
api/system-current.txt
View File

@@ -40793,12 +40793,10 @@ package android.service.wallpaper {
method public int getDesiredMinimumHeight(); method public int getDesiredMinimumHeight();
method public int getDesiredMinimumWidth(); method public int getDesiredMinimumWidth();
method public android.view.SurfaceHolder getSurfaceHolder(); method public android.view.SurfaceHolder getSurfaceHolder();
method public void invalidateColors();
method public boolean isPreview(); method public boolean isPreview();
method public boolean isVisible(); method public boolean isVisible();
method public void onApplyWindowInsets(android.view.WindowInsets); 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.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 onCreate(android.view.SurfaceHolder);
method public void onDesiredSizeChanged(int, int); method public void onDesiredSizeChanged(int, int);
method public void onDestroy(); method public void onDestroy();

2
api/test-current.txt
View File

@@ -37788,12 +37788,10 @@ package android.service.wallpaper {
method public int getDesiredMinimumHeight(); method public int getDesiredMinimumHeight();
method public int getDesiredMinimumWidth(); method public int getDesiredMinimumWidth();
method public android.view.SurfaceHolder getSurfaceHolder(); method public android.view.SurfaceHolder getSurfaceHolder();
method public void invalidateColors();
method public boolean isPreview(); method public boolean isPreview();
method public boolean isVisible(); method public boolean isVisible();
method public void onApplyWindowInsets(android.view.WindowInsets); 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.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 onCreate(android.view.SurfaceHolder);
method public void onDesiredSizeChanged(int, int); method public void onDesiredSizeChanged(int, int);
method public void onDestroy(); method public void onDestroy();

2
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -548,6 +548,7 @@ public abstract class WallpaperService extends Service {
/** /**
* Notifies the engine that wallpaper colors changed significantly. * Notifies the engine that wallpaper colors changed significantly.
* This will trigger a {@link #onComputeWallpaperColors()} call. * This will trigger a {@link #onComputeWallpaperColors()} call.
* @hide
*/ */
public void invalidateColors() { public void invalidateColors() {
try { try {
@@ -564,6 +565,7 @@ public abstract class WallpaperService extends Service {
* you might want to call {@link #invalidateColors()} in a near future. * you might want to call {@link #invalidateColors()} in a near future.
* *
* @return List of wallpaper colors and their weights. * @return List of wallpaper colors and their weights.
* @hide
*/ */
public @Nullable WallpaperColors onComputeWallpaperColors() { public @Nullable WallpaperColors onComputeWallpaperColors() {
return null; return null;