diff options
| author | Nick Chameyev <nickchameyev@google.com> | 2021-10-04 09:00:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-10-04 09:00:00 +0000 |
| commit | 3d984a776f68e1022fc1f97d742bc6d7097cb399 (patch) | |
| tree | 56ce5f79b3c2a1a6d4a067cf9dfe06160852b2fe /core/api | |
| parent | ce87ba4e87e3c42a93810a8e6166469fbcf96535 (diff) | |
| parent | 5985d390d6d38c143a5174c659e81ddc05135b45 (diff) | |
Merge "Rename shouldUseDefaultDeviceStateChangeTransition attribute" into sc-v2-dev
Diffstat (limited to 'core/api')
| -rw-r--r-- | core/api/current.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 9a16390baf10..1d03370e698d 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -1298,7 +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 shouldUseDefaultDeviceStateChangeTransition; + field public static final int shouldUseDefaultDisplayStateChangeTransition; field public static final int showAsAction = 16843481; // 0x10102d9 field public static final int showDefault = 16843258; // 0x10101fa field public static final int showDividers = 16843561; // 0x1010329 @@ -6927,7 +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 shouldUseDefaultDeviceStateChangeTransition(); + method public boolean shouldUseDefaultDisplayStateChangeTransition(); 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; |