summaryrefslogtreecommitdiff
path: root/core/api
diff options
context:
space:
mode:
authorNick Chameyev <nickchameyev@google.com>2021-09-21 16:09:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-09-21 16:09:41 +0000
commitc87aa1a23e11409cd5ea30b217d71dbc2e0787b4 (patch)
tree658477f1032f016c2c0a6375ceabb4dd52d9f887 /core/api
parent348a0e6e3c7e5b8a7554d18cd206edab179b926b (diff)
parent0a14f33198d939db9cca92c44b7f2789c32fe001 (diff)
Merge "Add should use default unfold transition attribute to wallpaper" into sc-v2-dev
Diffstat (limited to 'core/api')
-rw-r--r--core/api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index ec8dce0837cd..3aabe8dd6f20 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -1298,6 +1298,7 @@ package android {
field public static final int shortcutLongLabel = 16844074; // 0x101052a
field public static final int shortcutShortLabel = 16844073; // 0x1010529
field public static final int shouldDisableView = 16843246; // 0x10101ee
+ field public static final int shouldUseDefaultUnfoldTransition;
field public static final int showAsAction = 16843481; // 0x10102d9
field public static final int showDefault = 16843258; // 0x10101fa
field public static final int showDividers = 16843561; // 0x1010329
@@ -6926,6 +6927,7 @@ package android.app {
method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
method public CharSequence loadLabel(android.content.pm.PackageManager);
method public android.graphics.drawable.Drawable loadThumbnail(android.content.pm.PackageManager);
+ method public boolean shouldUseDefaultUnfoldTransition();
method public boolean supportsMultipleDisplays();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.WallpaperInfo> CREATOR;