diff options
| author | mariagpuyol <mariagpuyol@google.com> | 2016-06-02 20:59:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 20:59:48 +0000 |
| commit | ba9a1adceb02dc588514bf2b922bdbc1f0381299 (patch) | |
| tree | efa7830ecd48dfb4bee0ced88881cb38ad752cb4 | |
| parent | 3823b2d57411197777416dddc86cec6cbfc3b203 (diff) | |
| parent | dff26b8f88a99bb365096e5c5fff62f24f31ab80 (diff) | |
| download | android_packages_apps_EmergencyInfo-ba9a1adceb02dc588514bf2b922bdbc1f0381299.tar.gz android_packages_apps_EmergencyInfo-ba9a1adceb02dc588514bf2b922bdbc1f0381299.tar.bz2 android_packages_apps_EmergencyInfo-ba9a1adceb02dc588514bf2b922bdbc1f0381299.zip | |
Fix color issues
am: dff26b8f88
* commit 'dff26b8f88a99bb365096e5c5fff62f24f31ab80':
Fix color issues
Change-Id: I17cacf79c153e6db4a81e6dae0edd226d79872ce
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 | ||||
| -rw-r--r-- | res/xml/edit_emergency_info.xml | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 2fc205a..de826ca 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,4 +20,5 @@ <color name="tab_text_color">#FFFFFF</color> <color name="material_teal_200">#FF80CBC4</color> <color name="white_with_alpha">#B2FFFFFF</color> + <color name="hint_text_color">#36000000</color> </resources>
\ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index 73c5891..0789306 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,7 +18,7 @@ <item name="android:preferenceCategoryStyle">@style/AppTheme.PreferenceCategoryStyle</item> <item name="colorPrimary">@color/material_blue_grey_900</item> <item name="colorPrimaryDark">@color/material_blue_grey_950</item> - <item name="colorAccent">@color/material_teal_200</item> + <item name="tabIndicatorColor">@color/material_teal_200</item> <item name="android:datePickerStyle">@style/AppTheme.DatePickerStyle</item> </style> <!-- Base emergency theme. --> @@ -27,12 +27,14 @@ <item name="colorPrimaryDark">@color/emergency_primary_dark</item> <item name="colorPrimary">@color/emergency_primary</item> <item name="colorAccent">@color/emergency_accent</item> + <item name="tabIndicatorColor">@color/emergency_accent</item> </style> <!-- Tabs --> <style name="AppTheme.TabLayout" parent="Widget.Design.TabLayout"> <item name="tabTextAppearance">@style/AppTheme.TabText</item> <item name="tabSelectedTextColor">@color/tab_text_color</item> + <item name="tabIndicatorColor">?attr/tabIndicatorColor</item> <item name="tabIndicatorHeight">2dp</item> <item name="tabPaddingStart">24dp</item> <item name="tabPaddingEnd">24dp</item> diff --git a/res/xml/edit_emergency_info.xml b/res/xml/edit_emergency_info.xml index 26a6f87..2cb8ca7 100644 --- a/res/xml/edit_emergency_info.xml +++ b/res/xml/edit_emergency_info.xml @@ -46,6 +46,7 @@ <com.android.emergency.preferences.EmergencyEditTextPreference android:capitalize="sentences" android:hint="@string/allergies_hint" + android:textColorHint="@color/hint_text_color" android:icon="@drawable/ic_allergies_black_24dp" android:inputType="textMultiLine" android:key="allergies" @@ -56,6 +57,7 @@ <com.android.emergency.preferences.EmergencyEditTextPreference android:capitalize="sentences" android:hint="@string/medications_hint" + android:textColorHint="@color/hint_text_color" android:icon="@drawable/ic_medication_24dp" android:inputType="textMultiLine" android:key="medications" @@ -77,6 +79,7 @@ <com.android.emergency.preferences.EmergencyEditTextPreference android:capitalize="sentences" android:hint="@string/medical_conditions_hint" + android:textColorHint="@color/hint_text_color" android:icon="@drawable/ic_notes_black_24dp" android:inputType="textMultiLine" android:key="medical_conditions" |