diff options
| author | 2013-06-11 14:10:18 -0700 | |
|---|---|---|
| committer | 2013-06-11 14:10:18 -0700 | |
| commit | be173f6a16619ed82469bda7cf0df7c3763d3c81 (patch) | |
| tree | c019fbc6d4f31ce71d8e5208d2aed98232f0eb0f | |
| parent | 2ccb564d8066972847d8a5e4b8820c72638134b1 (diff) | |
| parent | 8fb120b67d785dc5ab0ebdb8efd7988da1a94365 (diff) | |
am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources bug: 9359960" into jb-mr2-dev
* commit '8fb120b67d785dc5ab0ebdb8efd7988da1a94365':
add ViewGroup's layoutMode attribute to public resources bug: 9359960
| -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 b3743f3bfcec..cf2f3926f3b3 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" /> |