diff options
| author | Craig Mautner <cmautner@google.com> | 2015-04-16 00:37:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 00:37:38 +0000 |
| commit | 556a4d2397a2c0db0a8b3e5a39ebf431a4fc562f (patch) | |
| tree | 7c8b8b347cdb9edd0be426796c48c97530baa672 | |
| parent | a217d69d05efb4c3637d9eaf510bafc52e0ffa4a (diff) | |
| parent | a8af4ab2b21753a664fcaa7f2605f746b6820671 (diff) | |
| download | frameworks_base-556a4d2397a2c0db0a8b3e5a39ebf431a4fc562f.zip frameworks_base-556a4d2397a2c0db0a8b3e5a39ebf431a4fc562f.tar.gz frameworks_base-556a4d2397a2c0db0a8b3e5a39ebf431a4fc562f.tar.bz2 | |
Merge "Fix build."
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 0490ff2..e8f18ea 100644 --- a/api/current.txt +++ b/api/current.txt @@ -815,7 +815,7 @@ package android { field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208 field public static final int listViewStyle = 16842868; // 0x1010074 field public static final int listViewWhiteStyle = 16842869; // 0x1010075 - field public static final int lockTaskMode = 16844013; // 0x10104ed + field public static final int lockTaskMode = 16844015; // 0x10104ef field public static final int logo = 16843454; // 0x10102be field public static final int longClickable = 16842982; // 0x10100e6 field public static final int loopViews = 16843527; // 0x1010307 diff --git a/api/system-current.txt b/api/system-current.txt index d932ad1..4910f5c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -888,7 +888,7 @@ package android { field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208 field public static final int listViewStyle = 16842868; // 0x1010074 field public static final int listViewWhiteStyle = 16842869; // 0x1010075 - field public static final int lockTaskMode = 16844013; // 0x10104ed + field public static final int lockTaskMode = 16844015; // 0x10104ef field public static final int logo = 16843454; // 0x10102be field public static final int longClickable = 16842982; // 0x10100e6 field public static final int loopViews = 16843527; // 0x1010307 diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index f9d43bd..8806869 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2653,7 +2653,6 @@ <public type="attr" name="colorBackgroundFloating" /> <public type="attr" name="extractNativeLibs" /> <public type="attr" name="usesCleartextTraffic" /> - <public type="attr" name="lockTaskMode" /> <!--IntentFilter auto verification --> <public type="attr" name="autoVerify" /> @@ -2664,4 +2663,6 @@ <!-- Animation --> <public type="attr" name="durationScaleHint" /> + + <public type="attr" name="lockTaskMode" /> </resources> |