diff options
| author | Craig Mautner <cmautner@google.com> | 2015-04-15 17:15:35 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2015-04-15 17:15:35 -0700 |
| commit | a8af4ab2b21753a664fcaa7f2605f746b6820671 (patch) | |
| tree | ae1c0e0aa2822b7311671a782fa6bcea30a79a93 | |
| parent | ef532f8435d47e68a3b718c861463e429b261682 (diff) | |
| download | frameworks_base-a8af4ab2b21753a664fcaa7f2605f746b6820671.zip frameworks_base-a8af4ab2b21753a664fcaa7f2605f746b6820671.tar.gz frameworks_base-a8af4ab2b21753a664fcaa7f2605f746b6820671.tar.bz2 | |
Fix build.
Change-Id: I46173df41fcfe44e44e030893bf60a8398c2c7f0
| -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 abd3081..2ea6831 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 fae1aa4..450ccea 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> |