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

Commit 115ad165 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 3355197 - Add attribute for fast scroll preview panel text color." into honeycomb

parents 39de4584 b2e55171

api/current.xml

+12 −1
Original line number Diff line number Diff line
@@ -4250,6 +4250,17 @@ 
 visibility="public"

>

</field>

<field name="fastScrollTextColor"

 type="int"

 transient="false"

 volatile="false"

 value="16843611"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="fastScrollThumbDrawable"

 type="int"

 transient="false"
@@ -260231,7 +260242,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</method>

</interface>

core/java/android/widget/FastScroller.java

+3 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class FastScroller { 
    private static final int[] DEFAULT_STATES = new int[0];



    private static final int[] ATTRS = new int[] {

        android.R.attr.textColorPrimary,

        android.R.attr.fastScrollTextColor,

        android.R.attr.fastScrollThumbDrawable,

        android.R.attr.fastScrollTrackDrawable,

        android.R.attr.fastScrollPreviewBackgroundLeft,
@@ -64,7 +64,7 @@ class FastScroller { 
        android.R.attr.fastScrollOverlayPosition

    };



    private static final int PRIMARY_TEXT_COLOR = 0;

    private static final int TEXT_COLOR = 0;

    private static final int THUMB_DRAWABLE = 1;

    private static final int TRACK_DRAWABLE = 2;

    private static final int PREVIEW_BACKGROUND_LEFT = 3;
@@ -247,7 +247,7 @@ class FastScroller { 
        mPaint.setTextAlign(Paint.Align.CENTER);

        mPaint.setTextSize(mOverlaySize / 2);



        ColorStateList textColor = ta.getColorStateList(PRIMARY_TEXT_COLOR);

        ColorStateList textColor = ta.getColorStateList(TEXT_COLOR);

        int textColorNormal = textColor.getDefaultColor();

        mPaint.setColor(textColorNormal);

        mPaint.setStyle(Paint.Style.FILL_AND_STROKE);

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -544,6 +544,9 @@ 
            <enum name="floating" value="0" />

            <enum name="atThumb" value="1" />

        </attr>

        <!-- Text color for the fast scroll index overlay. Make sure it

             plays nicely with fastScrollPreviewBackground[Left|Right]. -->

        <attr name="fastScrollTextColor" format="color" />



        <!-- =================== -->

        <!-- Action bar styles   -->

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,7 @@ 
  <public type="attr" name="windowMinWidthMajor" />

  <public type="attr" name="windowMinWidthMinor" />

  <public type="attr" name="queryHint" />

  <public type="attr" name="fastScrollTextColor" />



  <!-- A simple fade-in animation. -->

  <public type="animator" name="fade_in" id="0x010b0000" />

core/res/res/values/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ 
        <item name="fastScrollPreviewBackgroundRight">@android:drawable/menu_submenu_background</item>

        <item name="fastScrollPreviewBackgroundLeft">@android:drawable/menu_submenu_background</item>

        <item name="fastScrollOverlayPosition">floating</item>

        <item name="fastScrollTextColor">@android:color/primary_text_dark</item>



    </style>