diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-07 11:48:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-07 11:48:50 -0700 |
| commit | 33877e15b8bfc50bd874027689a4794aa93b923d (patch) | |
| tree | f2315456796e88f0623bf4fed1f2a43a49f3696d /api | |
| parent | 786d10921b2c525ed22b78ec40ae2554eec85912 (diff) | |
| parent | 5962b12bedc4a1d0354816c1cd6b06ba04f6d807 (diff) | |
| download | frameworks_base-33877e15b8bfc50bd874027689a4794aa93b923d.zip frameworks_base-33877e15b8bfc50bd874027689a4794aa93b923d.tar.gz frameworks_base-33877e15b8bfc50bd874027689a4794aa93b923d.tar.bz2 | |
Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/17.txt | 1 | ||||
| -rw-r--r-- | api/current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -912,6 +912,7 @@ 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 showSilent = 16843259; // 0x10101fb field public static final int showWeekNumber = 16843582; // 0x101033e field public static final int shownWeekCount = 16843585; // 0x1010341 diff --git a/api/current.txt b/api/current.txt index f236a74..f8ad4d9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -912,6 +912,7 @@ 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 showSilent = 16843259; // 0x10101fb field public static final int showWeekNumber = 16843582; // 0x101033e field public static final int shownWeekCount = 16843585; // 0x1010341 |