Merge "Hide WallpaperService.Engine colors API." into oc-dr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
1133cf2b8a
@@ -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();
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user