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

Commit 7573f496 authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix several small layout and color issues 

Adjusts switch track asset for consistent alignment across DPI buckets,
adjusts edit text background. Lightens the "Light" theme action bar
color so that it doesn't blend in with the action bar shadow.

BUG: 18430444
BUG: 18356558
BUG: 18390994
Change-Id: I1d1e26239fa0c921a65e4ec8b5df0b0093b3989c
parent 9899b663

core/res/res/drawable-hdpi/switch_track_mtrl_alpha.9.png

+7 B (475 B)
Loading image diff...

core/res/res/drawable-ldpi/switch_track_mtrl_alpha.9.png

deleted100644 → 0
−102 B
Loading image diff...

core/res/res/drawable/edit_text_material.xml

+17 −15
Original line number Diff line number Diff line
@@ -15,21 +15,23 @@ 
-->



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

        android:inset="@dimen/control_inset_material">

    <ripple android:color="?attr/colorControlActivated">

        <item>

       android:insetLeft="@dimen/edit_text_inset_horizontal_material"

       android:insetRight="@dimen/edit_text_inset_horizontal_material"

       android:insetTop="@dimen/edit_text_inset_top_material"

       android:insetBottom="@dimen/edit_text_inset_bottom_material">

    <selector>

        <item android:state_enabled="false">

            <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"

                android:tint="?attr/colorControlNormal"

                android:alpha="?attr/disabledAlpha" />

        </item>

                <item>

        <item android:state_pressed="false" android:state_focused="false">

            <nine-patch android:src="@drawable/textfield_default_mtrl_alpha"

                android:tint="?attr/colorControlNormal" />

        </item>

            </selector>

        <item>

            <nine-patch android:src="@drawable/textfield_activated_mtrl_alpha"

                android:tint="?attr/colorControlActivated" />

        </item>

        <item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" />

    </ripple>

    </selector>

</inset>

core/res/res/values/colors_material.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <color name="background_floating_material_light">#ffeeeeee</color>



    <color name="primary_material_dark">#ff212121</color>

    <color name="primary_material_light">#ffe0e0e0</color>

    <color name="primary_material_light">#ffefefef</color>

    <color name="primary_dark_material_dark">#ff000000</color>

    <color name="primary_dark_material_light">#ff757575</color>

core/res/res/values/dimens_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ 
    <!-- Default rounded corner for controls -->

    <dimen name="control_corner_material">2dp</dimen>



    <dimen name="edit_text_inset_horizontal_material">4dp</dimen>

    <dimen name="edit_text_inset_top_material">4dp</dimen>

    <dimen name="edit_text_inset_bottom_material">8dp</dimen>



    <dimen name="dialog_padding_material">24dp</dimen>

    <dimen name="dialog_padding_top_material">18dp</dimen>

</resources>