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

Commit 2c30f922 authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Improved theme color utilization."

parents 765de601 1127b8ff

res/color/selection_demo_item_selector.xml

+5 −2
Original line number Diff line number Diff line
@@ -17,8 +17,11 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_activated="true"

        android:color="@color/selection_demo_selector_text_selected"/>

        android:color="?android:attr/colorForeground"

        />

    <item

        android:state_activated="false"

        android:color="@color/selection_demo_selector_text"/>

        android:color="?android:attr/colorForeground"

        android:alpha=".3"

        />

</selector>

res/drawable/selection_demo_item_background.xml

+3 −7
Original line number Diff line number Diff line
@@ -14,12 +14,8 @@ 
     limitations under the License.

-->





<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_activated="true"

        android:drawable="@color/selection_demo_item_background_selected"/>

    <item

        android:state_activated="false"

        android:drawable="@color/selection_demo_item_background"/>

    <item android:state_activated="true">

        <color android:color="?android:attr/colorControlHighlight"></color>

    </item>

</selector>

res/values/colors.xml

+0 −6
Original line number Diff line number Diff line
@@ -80,10 +80,4 @@ 
    <color name="inspector_section_title">#ff939393</color>

    <color name="inspector_section_divider">#E0E0E0</color>

    <color name="inspector_title_background">#40000000</color>



    <color name="selection_demo_selector_text">#22000000</color>

    <color name="selection_demo_selector_text_selected">@*android:color/black</color>



    <color name="selection_demo_item_background">@*android:color/white</color>

    <color name="selection_demo_item_background_selected">#4d3367d6</color>

</resources>

res/layout/selection_demo_list_item.xml

+6 −6

File changed.

Contains only whitespace changes.