diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-04-15 12:01:38 -0700 |
|---|---|---|
| committer | Wale Ogunwale <ogunwale@google.com> | 2015-04-16 10:59:16 -0700 |
| commit | 6dfdfd6741c5a3dd8d8a49ddbd6ee5dfe2fd292d (patch) | |
| tree | d5cc521ef757040ed4503e0fabbfb4e9d5336ef3 /api | |
| parent | 3f2631f526d0a0ac0b57ac9f6d241bcc7aeb5f5b (diff) | |
| download | frameworks_base-6dfdfd6741c5a3dd8d8a49ddbd6ee5dfe2fd292d.zip frameworks_base-6dfdfd6741c5a3dd8d8a49ddbd6ee5dfe2fd292d.tar.gz frameworks_base-6dfdfd6741c5a3dd8d8a49ddbd6ee5dfe2fd292d.tar.bz2 | |
Added attribute showForAllUsers that deprecates showOnLockScreen
The new name is more meaningful to what the attribute actually does.
Also, force the FLAG_SHOWN_WHEN_LOCKED flag for windows that belong
to acitivties with the showForAllUsers attribute set.
Bug: 20227306
Change-Id: Ifd49166c3ec0e67ae43addc0fb30038523332ea5
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 d73b9f9..da39063 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1098,7 +1098,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 f98e15f..a1980f0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1175,7 +1175,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 |