diff options
| author | Maria Garcia Puyol <mariagpuyol@google.com> | 2016-03-25 23:35:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-25 23:35:48 +0000 |
| commit | 0cb2b75b18dcee6ae2e93439fbc1707bc5408d92 (patch) | |
| tree | 486c9fe35c0fe623caa6c03f9e07355f642ee362 /res | |
| parent | c638aa1ab0250b3887e720f781741642481b953d (diff) | |
| parent | 954679b1b42695d0d101c1e5001ad9b6d561287d (diff) | |
| download | EmergencyInfo-0cb2b75b18dcee6ae2e93439fbc1707bc5408d92.tar.gz | |
Merge "Small UI changes from UX feedback" into nyc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/colors.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 | ||||
| -rw-r--r-- | res/values/styles.xml | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 756ddf34..2fc205af 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -18,4 +18,6 @@ <color name="emergency_primary">#E53935</color> <color name="emergency_accent">#FFFF00</color> <color name="tab_text_color">#FFFFFF</color> + <color name="material_teal_200">#FF80CBC4</color> + <color name="white_with_alpha">#B2FFFFFF</color> </resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 95aafa15..031a217a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -36,10 +36,10 @@ <string name="date_of_birth">Date of birth</string> <!-- The default preference subtitle text to show when the date of birth is unknown. [CHAR_LIMIT=40] --> <string name="unknown_date_of_birth">Unknown</string> - <!-- The age and date of birth of the user. [CHAR_LIMIT=40] --> - <string name="dob_and_age"> - Age: <xliff:g id="numerical_age" example="29">%1$d</xliff:g> (<xliff:g id="date_of_birth" example="3 feb 1987">%2$s</xliff:g>) - </string> + <!-- Parenthesis around the date of birth of a user. [CHAR_LIMIT=40] --> + <string name="dob"> + (<xliff:g id="date_of_birth" example="3 feb 1987">%1$s</xliff:g>) + </string> <!-- The age of the user. [CHAR_LIMIT=20] --> <string name="age"> Age: <xliff:g id="numerical_age" example="29">%1$d</xliff:g> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4081c992..4b985dc4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,6 +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="android:datePickerStyle">@style/AppTheme.DatePickerStyle</item> </style> <!-- Base emergency theme. --> |