diff options
| author | Scott Main <smain@google.com> | 2013-06-10 14:30:35 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2013-06-18 19:11:06 -0700 |
| commit | c931032da069d2f1cafb65b57860977876c3e782 (patch) | |
| tree | b6ee8cf621b215e9862096ae6bbcb4d8f50cb12f | |
| parent | 0e57464d905037dfb269a221963d91f65b288288 (diff) | |
| download | base-c931032da069d2f1cafb65b57860977876c3e782.tar.gz | |
add ViewGroup's layoutMode attribute to public resources
bug: 9359960
Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ed1983481262..02b95a0fc10b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -639,6 +639,7 @@ package android { field public static final int layout = 16842994; // 0x10100f2 field public static final int layoutAnimation = 16842988; // 0x10100ec field public static final int layoutDirection = 16843698; // 0x10103b2 + field public static final int layoutMode = 16843738; // 0x10103da field public static final int layout_above = 16843140; // 0x1010184 field public static final int layout_alignBaseline = 16843142; // 0x1010186 field public static final int layout_alignBottom = 16843146; // 0x101018a diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 2d9713813d78..22ef31b8f047 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2046,6 +2046,7 @@ <public type="attr" name="canRequestTouchExplorationMode" id="0x010103d7" /> <public type="attr" name="canRequestEnhancedWebAccessibility" id="0x010103d8" /> <public type="attr" name="canRequestFilterKeyEvents" id="0x010103d9" /> + <public type="attr" name="layoutMode" id="0x010103da" /> <public type="style" name="Theme.Holo.NoActionBar.Overscan" id="0x010301dd" /> <public type="style" name="Theme.Holo.Light.NoActionBar.Overscan" id="0x010301de" /> |