Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89429a42 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Remove @deprecate in View's fadingEdge"

parents caaac348 259c1090

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,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 deprecated int fadingEdge = 16842975; // 0x10100df

    field public static final 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

core/res/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -1830,12 +1830,12 @@ 
        <!-- Defines whether the vertical scrollbar track should always be drawn. -->

        <attr name="scrollbarAlwaysDrawVerticalTrack" format="boolean" />



        <!-- {@deprecated This attribute is deprecated and will be ignored as of

             API level 14 (<code>android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH</code>).

        <!-- This attribute is deprecated and will be ignored as of

             API level 14 ({@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 14 and above,

             use the <code>requiresFadingEdge</code> attribute instead.} -->

             use the <code>android:requiresFadingEdge</code> attribute instead. -->

        <attr name="fadingEdge">

            <!-- No edge is faded. -->

            <flag name="none" value="0x00000000" />