Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix hint text color to align with latest Material spec" into nyc-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2016-09-08 20:00:32 +00:00
committed by Android (Google) Code Review
parent 8c83edc43b 6ae673caf4
commit e00fe59837
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/color/hint_foreground_material_dark.xml
View File

@@ -15,6 +15,10 @@
-->
<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"
android:color="@color/foreground_material_dark" />
</selector>

4
core/res/res/color/hint_foreground_material_light.xml
View File

@@ -15,6 +15,10 @@
-->
<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"
android:color="@color/foreground_material_light" />
</selector>

5
core/res/res/values/colors_material.xml
View File

@@ -61,7 +61,10 @@
<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.54</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>