Move search_bar_expanded into common
In the process of moving this, I also found and fixed
two bugs.
1) Text size was set incorrectly (looked like a typo)
2) The "up button" used the "content overflow"s content
description
Change-Id: I8d1f1904e3091461f964ba98483a9afbce05fecd
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index 1d727d5..4e5e3d3 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -78,6 +78,10 @@
<!-- Background color of action bars. Ensure this stays in sync with packages/Telephony
actionbar_background_color. -->
<color name="actionbar_background_color">#0fc6dc</color>
+ <!-- Color for icons in the actionbar -->
+ <color name="actionbar_icon_color">#ffffff</color>
+ <!-- Darker version of the actionbar color. Used for the status bar and navigation bar colors. -->
+ <color name="actionbar_background_color_dark">#008aa1</color>
<!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
phone_settings_actionbar_text_color-->
@@ -92,4 +96,11 @@
<color name="dialpad_digits_text_color">#666666</color>
<color name="dialpad_separator_line_color">#dadada</color>
<color name="dialpad_icon_tint">#b3b3b3</color>
+
+ <!-- Text color of the search box text as entered by user -->
+ <color name="searchbox_text_color">#000000</color>
+ <!-- Background color of the search box -->
+ <color name="searchbox_background_color">#ffffff</color>
+ <!-- Text color of the search box hint text -->
+ <color name="searchbox_hint_text_color">#a4a4a4</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 5bc73f6..e366689 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -134,4 +134,13 @@
<dimen name="dialpad_key_button_translate_y">100dp</dimen>
+
+ <!-- Padding around the icon in the search box. -->
+ <dimen name="search_box_icon_margin">4dp</dimen>
+ <!-- Size of the icon (voice search, close search) in the search box. -->
+ <dimen name="search_box_icon_size">28dp</dimen>
+ <!-- Left margin of the text field in the search box. -->
+ <dimen name="search_box_text_left_margin">27dp</dimen>
+ <!-- Search box text size -->
+ <dimen name="search_text_size">14sp</dimen>
</resources>
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 3f195ad..095157f 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -808,4 +808,15 @@
<!-- Font family used when drawing letters for letter tile avatars.
Do not translate. -->
<string name="letter_tile_letter_font_family">sans-serif-thin</string>
+
+ <!-- Content description for the fake action menu up button as used
+ inside search. [CHAR LIMIT=NONE] -->
+ <string name="action_menu_back_from_search">stop searching</string>
+
+ <!-- String describing the icon used to clear the search field -->
+ <string name="description_clear_search">Clear search</string>
+
+ <!-- The font-family to use for the text inside the searchbox.
+ Do not translate. -->
+ <string name="search_font_family">sans-serif</string>
</resources>