diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-20 17:45:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 17:45:52 +0000 |
| commit | f31512eb17b6327c5f81bfb8a69c3a6119a0dd66 (patch) | |
| tree | f943aef163183fb7727f3864fb8ba67a05d35634 /core/res | |
| parent | b5eb843e4b7c56259e2609e2e668bf5a4cd51f42 (diff) | |
| parent | e5b082d6eb0489e7dbe3159338f8c94c0af61dee (diff) | |
| download | frameworks_base-f31512eb17b6327c5f81bfb8a69c3a6119a0dd66.zip frameworks_base-f31512eb17b6327c5f81bfb8a69c3a6119a0dd66.tar.gz frameworks_base-f31512eb17b6327c5f81bfb8a69c3a6119a0dd66.tar.bz2 | |
Merge "Various API council fixes to drawables"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 55e2983..4b03f31 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -4497,7 +4497,7 @@ RTL (right-to-left). --> <attr name="autoMirrored" /> <!-- Indicates how layer padding should affect the bounds of subsequent layers. - The default value is nest. --> + The default padding mode value is nest. --> <attr name="paddingMode"> <!-- Nest each layer inside the padding of the previous layer. --> <enum name="nest" value="0" /> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 1bb0d42..32ce568 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2177,6 +2177,7 @@ <public type="attr" name="contentInsetEnd" /> <public type="attr" name="contentInsetLeft" /> <public type="attr" name="contentInsetRight" /> + <public type="attr" name="paddingMode" /> <public-padding type="dimen" name="l_resource_pad" end="0x01050010" /> |