PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improvements to user settings" into lmp-dev

Browse Source
This commit is contained in:
Amith Yamasani
2014-07-18 14:58:58 +00:00
committed by Android (Google) Code Review
parent 89265a3026 c16b73e92b
commit d0a057ccc8
65 changed files with 362 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/values/colors.xml
View File

@@ -68,4 +68,17 @@
<color name="default_preference_background_color">@android:color/white</color>
<color name="preference_list_fragment_background_color">@color/default_preference_background_color</color>
<color name="search_panel_list_background_color">@color/default_preference_background_color</color>
<!-- Default avatar colors -->
<color name="pink_500">#ffe91e63</color>
<color name="indigo_500">#ff3f51b5</color>
<color name="blue_500">@*android:color/material_blue_500</color>
<color name="teal_500">@*android:color/material_teal_500</color>
<color name="green_500">@*android:color/material_green_500</color>
<color name="light_green_500">#ff8bc34a</color>
<color name="orange_500">@*android:color/material_orange_500</color>
<color name="deep_orange_500">@*android:color/material_deep_orange_500</color>
<!-- Avatar color used for guest -->
<color name="grey_500">@*android:color/material_grey_500</color>
</resources>

6
res/values/strings.xml
View File

@@ -5169,6 +5169,12 @@
<string name="user_delete_button">Delete</string>
<!-- Title for Guest user [CHAR LIMIT=35] -->
<string name="user_guest">Guest</string>
<!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
<string name="user_exit_guest_title">Exit guest</string>
<!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
<string name="user_exit_guest_confirm_title">Exiting guest session?</string>
<!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
<string name="user_exit_guest_confirm_message">Ending the guest session will remove local data.</string>
<!-- Title of preference to enable calling[CHAR LIMIT=35] -->
<string name="user_enable_calling">Enable phone calls?</string>