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

Commit c6c744da authored by Adam Powell's avatar Adam Powell
Browse files

Add colorEdgeEffect to themes, default it to colorPrimary 

Allow edgeeffect colors to be changed independently of the primary
color for the current theme.

Bug 16512225

Change-Id: Ibc13ad755f489fe1f6d16af0c61a1d12dd1a61f7
parent b6812b64

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ package android { 
    field public static final int colorControlActivated = 16843818; // 0x101042a

    field public static final int colorControlHighlight = 16843820; // 0x101042c

    field public static final int colorControlNormal = 16843817; // 0x1010429

    field public static final int colorEdgeEffect = 16843982; // 0x10104ce

    field public static final int colorFocusedHighlight = 16843663; // 0x101038f

    field public static final int colorForeground = 16842800; // 0x1010030

    field public static final int colorForegroundInverse = 16843270; // 0x1010206

core/java/android/widget/EdgeEffect.java

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class EdgeEffect { 
        final TypedArray a = context.obtainStyledAttributes(

                com.android.internal.R.styleable.EdgeEffect);

        final int themeColor = a.getColor(

                com.android.internal.R.styleable.EdgeEffect_colorPrimary, 0xff666666);

                com.android.internal.R.styleable.EdgeEffect_colorEdgeEffect, 0xff666666);

        a.recycle();

        mPaint.setColor((themeColor & 0xffffff) | 0x33000000);

        mPaint.setStyle(Paint.Style.FILL);

core/res/res/values/attrs.xml

+4 −1
Original line number Diff line number Diff line
@@ -1020,6 +1020,9 @@ 
        <!-- The color applied to framework switch thumbs in their normal state. -->

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



        <!-- The color applied to the edge effect on scrolling containers. -->

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



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

        <!-- Lighting properties -->

        <!-- =================== -->
@@ -7435,7 +7438,7 @@ 


    <!-- Used as a filter array on the theme to pull out only the EdgeEffect-relevant bits. -->

    <declare-styleable name="EdgeEffect">

        <attr name="colorPrimary" />

        <attr name="colorEdgeEffect" />

    </declare-styleable>



    <!-- Use <code>tv-input</code> as the root tag of the XML resource that describes a

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2291,6 +2291,7 @@ 
    <public type="attr" name="strokeAlpha" id="0x010104cb" />

    <public type="attr" name="fillAlpha" id="0x010104cc" />

    <public type="attr" name="windowActivityTransitions" id="0x010104cd" />

    <public type="attr" name="colorEdgeEffect" id="0x010104ce" />



    <public type="id" name="mask" id="0x0102002e" />

    <public type="id" name="statusBarBackground" id="0x0102002f" />

core/res/res/values/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ please see themes_device_defaults.xml. 
        <item name="colorControlNormal">@color/legacy_control_normal</item>

        <item name="colorControlHighlight">@color/legacy_button_pressed</item>

        <item name="colorButtonNormal">@color/legacy_button_normal</item>

        <item name="colorEdgeEffect">?attr/colorPrimary</item>



        <item name="disabledAlpha">0.5</item>

        <item name="backgroundDimAmount">0.6</item>