diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-04-16 22:35:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 22:35:35 +0000 |
| commit | 6041cc1a07511fe8fe913793b9743e32c9b507c6 (patch) | |
| tree | e144b23b5e4d17741ac131f4bf7c8f5cadf445a0 /api | |
| parent | 43fbb42a72e38f6746c5387420fd6f21cd855c93 (diff) | |
| parent | 6dfdfd6741c5a3dd8d8a49ddbd6ee5dfe2fd292d (diff) | |
| download | frameworks_base-6041cc1a07511fe8fe913793b9743e32c9b507c6.zip frameworks_base-6041cc1a07511fe8fe913793b9743e32c9b507c6.tar.gz frameworks_base-6041cc1a07511fe8fe913793b9743e32c9b507c6.tar.bz2 | |
Merge "Added attribute showForAllUsers that deprecates showOnLockScreen"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 5437d56..404941d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1099,7 +1099,8 @@ package android { field public static final int showAsAction = 16843481; // 0x10102d9 field public static final int showDefault = 16843258; // 0x10101fa field public static final int showDividers = 16843561; // 0x1010329 - field public static final int showOnLockScreen = 16843721; // 0x10103c9 + field public static final int showForAllUsers = 16844018; // 0x10104f2 + field public static final deprecated int showOnLockScreen = 16843721; // 0x10103c9 field public static final int showSilent = 16843259; // 0x10101fb field public static final int showText = 16843949; // 0x10104ad field public static final deprecated int showWeekNumber = 16843582; // 0x101033e diff --git a/api/system-current.txt b/api/system-current.txt index b2bee6e..1d1dcad 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1176,7 +1176,8 @@ package android { field public static final int showAsAction = 16843481; // 0x10102d9 field public static final int showDefault = 16843258; // 0x10101fa field public static final int showDividers = 16843561; // 0x1010329 - field public static final int showOnLockScreen = 16843721; // 0x10103c9 + field public static final int showForAllUsers = 16844018; // 0x10104f2 + field public static final deprecated int showOnLockScreen = 16843721; // 0x10103c9 field public static final int showSilent = 16843259; // 0x10101fb field public static final int showText = 16843949; // 0x10104ad field public static final deprecated int showWeekNumber = 16843582; // 0x101033e |