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

Commit 94c4c0ab authored by Alexandre Elias's avatar Alexandre Elias Committed by Automerger Merge Worker
Browse files

Merge "Improve SearchView & secondary text accessibility" into... 

Merge "Improve SearchView & secondary text accessibility" into tm-dev-plus-aosp am: e29e536b am: 5ab3ad9a am: 956df372

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18451560



Change-Id: I29167ea2422aaff92ffba4b3ab7dab17eca6e9b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42f0fa2d 956df372

core/res/res/color/hint_foreground_material_dark.xml

+1 −5
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
-->



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

    <item android:state_enabled="true"

          android:state_pressed="true"

          android:alpha="@dimen/hint_pressed_alpha_material_dark"

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

    <item android:alpha="@dimen/hint_alpha_material_dark"

    <item android:alpha="@dimen/secondary_content_alpha_material_dark"

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

</selector>

core/res/res/color/hint_foreground_material_light.xml

+1 −5
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
-->



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

    <item android:state_enabled="true"

          android:state_pressed="true"

          android:alpha="@dimen/hint_pressed_alpha_material_light"

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

    <item android:alpha="@dimen/hint_alpha_material_light"

    <item android:alpha="@dimen/secondary_content_alpha_material_light"

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

</selector>

core/res/res/layout/search_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ 
                android:id="@+id/search_close_btn"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:paddingStart="8dip"

                android:paddingEnd="8dip"

                android:paddingStart="12dip"

                android:paddingEnd="12dip"

                android:layout_gravity="center_vertical"

                android:background="?attr/selectableItemBackgroundBorderless"

                android:focusable="true"

core/res/res/values/colors_material.xml

+1 −7
Original line number Diff line number Diff line
@@ -65,18 +65,12 @@ 
    <!-- 70% white -->

    <color name="secondary_text_default_material_dark">#b3ffffff</color>



    <item name="hint_alpha_material_dark" format="float" type="dimen">0.50</item>

    <item name="hint_alpha_material_light" format="float" type="dimen">0.38</item>



    <item name="hint_pressed_alpha_material_dark" format="float" type="dimen">0.70</item>

    <item name="hint_pressed_alpha_material_light" format="float" type="dimen">0.54</item>



    <item name="disabled_alpha_material_light" format="float" type="dimen">0.26</item>

    <item name="disabled_alpha_material_dark" format="float" type="dimen">0.30</item>

    <item name="primary_content_alpha_material_dark" format="float" type="dimen">1</item>

    <item name="primary_content_alpha_material_light" format="float" type="dimen">0.87</item>

    <item name="secondary_content_alpha_material_dark" format="float" type="dimen">.7</item>

    <item name="secondary_content_alpha_material_light" format="float" type="dimen">0.54</item>

    <item name="secondary_content_alpha_material_light" format="float" type="dimen">0.60</item>



    <item name="highlight_alpha_material_light" format="float" type="dimen">0.10</item>

    <item name="highlight_alpha_material_dark" format="float" type="dimen">0.10</item>