diff options
| author | Romain Guy <romainguy@google.com> | 2011-09-09 17:35:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-09 17:35:02 -0700 |
| commit | 3593fc4c3fac8d957db0171387472e7b812c9073 (patch) | |
| tree | fd5213562dcf66557bcf0d21c3f3bf0d1c3e8f5f /core/res | |
| parent | fbab086933cfbfda2b41b2dbf69ac644f36a686f (diff) | |
| parent | 1ef3fdbe047c805ce33b2be463ea51dec5952729 (diff) | |
| download | frameworks_base-3593fc4c3fac8d957db0171387472e7b812c9073.zip frameworks_base-3593fc4c3fac8d957db0171387472e7b812c9073.tar.gz frameworks_base-3593fc4c3fac8d957db0171387472e7b812c9073.tar.bz2 | |
Merge "Go faster!!!!"
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/attrs.xml | 17 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 525b03a..2e61cf5 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1804,7 +1804,13 @@ <!-- Defines whether the vertical scrollbar track should always be drawn. --> <attr name="scrollbarAlwaysDrawVerticalTrack" format="boolean" /> - <!-- Defines which edges should be fadeded on scrolling. --> + <!-- {@deprecated This attribute is deprecated and will be ignored as of + API level {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH}. + Using fading edges may introduce noticeable performance + degradations and should be used only when required by the application's + visual design. To request fading edges with API level + {@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH} and above, + use the <code>requiresFadingEdge</code> attribute instead.} --> <attr name="fadingEdge"> <!-- No edge is faded. --> <flag name="none" value="0x00000000" /> @@ -1813,6 +1819,15 @@ <!-- Fades vertical edges only. --> <flag name="vertical" value="0x00002000" /> </attr> + <!-- Defines which edges should be faded on scrolling. --> + <attr name="requiresFadingEdge"> + <!-- No edge is faded. --> + <flag name="none" value="0x00000000" /> + <!-- Fades horizontal edges only. --> + <flag name="horizontal" value="0x00001000" /> + <!-- Fades vertical edges only. --> + <flag name="vertical" value="0x00002000" /> + </attr> <!-- Defines the length of the fading edges. --> <attr name="fadingEdgeLength" format="dimension" /> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 50dee12..9327a0b 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1806,6 +1806,8 @@ <public type="attr" name="listPreferredItemPaddingLeft" /> <public type="attr" name="listPreferredItemPaddingRight" /> + <public type="attr" name="requiresFadingEdge" /> + <public type="style" name="TextAppearance.SuggestionHighlight" /> <public type="style" name="Theme.Holo.Light.DarkActionBar" /> |