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

Commit ad03aa84 authored by Chris Poultney's avatar Chris Poultney Committed by Android (Google) Code Review
Browse files

Merge "Expose WallpaperDescription set cropping methods as @SystemApi" into main

parents 4296eea8 d01300a9

core/api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -3165,6 +3165,11 @@ package android.app.wallpaper { 
    method @NonNull public android.util.SparseArray<android.graphics.Rect> getCropHints();

  }













  public static final class WallpaperDescription.Builder {













    method @NonNull public android.app.wallpaper.WallpaperDescription.Builder setCropHints(@NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>);













    method @NonNull public android.app.wallpaper.WallpaperDescription.Builder setCropHints(@NonNull android.util.SparseArray<android.graphics.Rect>);













  }



























}





























package android.app.wallpapereffectsgeneration {

























core/api/test-current.txt



+0
−9






























Original line number
Diff line number
Diff line








@@ -881,15 +881,6 @@ package android.app.usage {





























}





























package android.app.wallpaper {



























  public static final class WallpaperDescription.Builder {













    method @NonNull public android.app.wallpaper.WallpaperDescription.Builder setCropHints(@NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>);













    method @NonNull public android.app.wallpaper.WallpaperDescription.Builder setCropHints(@NonNull android.util.SparseArray<android.graphics.Rect>);













  }



























}





























package android.appwidget {































  public class AppWidgetManager {

































core/java/android/app/wallpaper/WallpaperDescription.java



+2
−6






























Original line number
Diff line number
Diff line








@@ -19,9 +19,7 @@ package android.app.wallpaper;













import static android.app.Flags.FLAG_LIVE_WALLPAPER_CONTENT_HANDLING;































import android.annotation.FlaggedApi;













import android.annotation.SuppressLint;















import android.annotation.SystemApi;













import android.annotation.TestApi;















import android.app.WallpaperInfo;















import android.app.WallpaperManager;















import android.app.WallpaperManager.ScreenOrientation;










@@ -514,8 +512,7 @@ public final class WallpaperDescription implements Parcelable {













         * @hide















         */















        @NonNull













        @TestApi













        @SuppressLint("MissingGetterMatchingBuilder")













        @SystemApi















        public Builder setCropHints(@NonNull Map<Point, Rect> cropHints) {















            mCropHints = new SparseArray<>();















            cropHints.forEach(









@@ -531,8 +528,7 @@ public final class WallpaperDescription implements Parcelable {













         * @hide















         */















        @NonNull













        @TestApi













        @SuppressLint("MissingGetterMatchingBuilder")













        @SystemApi















        public Builder setCropHints(@NonNull SparseArray<Rect> cropHints) {















            mCropHints = cropHints;















            return this;