diff options
| -rw-r--r-- | api/current.txt | 9 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 18 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 17 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
4 files changed, 36 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index 950a4aa..986fa1c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -370,7 +370,7 @@ package android { field public static final int dialogTitle = 16843250; // 0x10101f2 field public static final int digits = 16843110; // 0x1010166 field public static final int direction = 16843217; // 0x10101d1 - field public static final int directionDescriptions = 16843695; // 0x10103af + field public static final int directionDescriptions = 16843696; // 0x10103b0 field public static final int directionPriority = 16843218; // 0x10101d2 field public static final int disableDependentsState = 16843249; // 0x10101f1 field public static final int disabledAlpha = 16842803; // 0x1010033 @@ -435,7 +435,7 @@ package android { field public static final int fadeEnabled = 16843390; // 0x101027e field public static final int fadeOffset = 16843383; // 0x1010277 field public static final int fadeScrollbars = 16843434; // 0x10102aa - field public static final int fadingEdge = 16842975; // 0x10100df + field public static final deprecated int fadingEdge = 16842975; // 0x10100df field public static final int fadingEdgeLength = 16842976; // 0x10100e0 field public static final int fastScrollAlwaysVisible = 16843573; // 0x1010335 field public static final int fastScrollEnabled = 16843302; // 0x1010226 @@ -711,7 +711,7 @@ package android { field public static final int overScrollFooter = 16843459; // 0x10102c3 field public static final int overScrollHeader = 16843458; // 0x10102c2 field public static final int overScrollMode = 16843457; // 0x10102c1 - field public static final int overridesImplicitlyEnabledSubtype = 16843696; // 0x10103b0 + field public static final int overridesImplicitlyEnabledSubtype = 16843697; // 0x10103b1 field public static final int packageNames = 16843649; // 0x1010381 field public static final int padding = 16842965; // 0x10100d5 field public static final int paddingBottom = 16842969; // 0x10100d9 @@ -790,6 +790,7 @@ package android { field public static final int reqNavigation = 16843306; // 0x101022a field public static final int reqTouchScreen = 16843303; // 0x1010227 field public static final int required = 16843406; // 0x101028e + field public static final int requiresFadingEdge = 16843694; // 0x10103ae field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364 field public static final int resizeMode = 16843619; // 0x1010363 field public static final int resizeable = 16843405; // 0x101028d @@ -942,7 +943,7 @@ package android { field public static final int tag = 16842961; // 0x10100d1 field public static final int targetActivity = 16843266; // 0x1010202 field public static final int targetClass = 16842799; // 0x101002f - field public static final int targetDescriptions = 16843694; // 0x10103ae + field public static final int targetDescriptions = 16843695; // 0x10103af field public static final int targetDrawables = 16843654; // 0x1010386 field public static final int targetPackage = 16842785; // 0x1010021 field public static final int targetSdkVersion = 16843376; // 0x1010270 diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 7a35015..637f646 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -69,6 +69,8 @@ import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputMethodManager; import android.widget.ScrollBarDrawable; +import static android.os.Build.VERSION_CODES.*; + import com.android.internal.R; import com.android.internal.util.Predicate; import com.android.internal.view.menu.MenuBuilder; @@ -585,7 +587,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * @attr ref android.R.styleable#View_drawingCacheQuality * @attr ref android.R.styleable#View_duplicateParentState * @attr ref android.R.styleable#View_id - * @attr ref android.R.styleable#View_fadingEdge + * @attr ref android.R.styleable#View_requiresFadingEdge * @attr ref android.R.styleable#View_fadingEdgeLength * @attr ref android.R.styleable#View_filterTouchesWhenObscured * @attr ref android.R.styleable#View_fitsSystemWindows @@ -2895,6 +2897,12 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal } break; case R.styleable.View_fadingEdge: + if (context.getApplicationInfo().targetSdkVersion >= ICE_CREAM_SANDWICH) { + // Ignore the attribute starting with ICS + break; + } + // With builds < ICS, fall through and apply fading edges + case R.styleable.View_requiresFadingEdge: final int fadingEdge = a.getInt(attr, FADING_EDGE_NONE); if (fadingEdge != FADING_EDGE_NONE) { viewFlagValues |= fadingEdge; @@ -8642,7 +8650,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal * otherwise * * @see #setHorizontalFadingEdgeEnabled(boolean) - * @attr ref android.R.styleable#View_fadingEdge + * @attr ref android.R.styleable#View_requiresFadingEdge */ public boolean isHorizontalFadingEdgeEnabled() { return (mViewFlags & FADING_EDGE_HORIZONTAL) == FADING_EDGE_HORIZONTAL; @@ -8657,7 +8665,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal * horizontally * * @see #isHorizontalFadingEdgeEnabled() - * @attr ref android.R.styleable#View_fadingEdge + * @attr ref android.R.styleable#View_requiresFadingEdge */ public void setHorizontalFadingEdgeEnabled(boolean horizontalFadingEdgeEnabled) { if (isHorizontalFadingEdgeEnabled() != horizontalFadingEdgeEnabled) { @@ -8677,7 +8685,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal * otherwise * * @see #setVerticalFadingEdgeEnabled(boolean) - * @attr ref android.R.styleable#View_fadingEdge + * @attr ref android.R.styleable#View_requiresFadingEdge */ public boolean isVerticalFadingEdgeEnabled() { return (mViewFlags & FADING_EDGE_VERTICAL) == FADING_EDGE_VERTICAL; @@ -8692,7 +8700,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal * vertically * * @see #isVerticalFadingEdgeEnabled() - * @attr ref android.R.styleable#View_fadingEdge + * @attr ref android.R.styleable#View_requiresFadingEdge */ public void setVerticalFadingEdgeEnabled(boolean verticalFadingEdgeEnabled) { if (isVerticalFadingEdgeEnabled() != verticalFadingEdgeEnabled) { 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" /> |