Merge "Removed search_bar_expanded from Dialer"

4 files changed, 0 insertions, 38 deletions

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 42d91189b..f6cae5668 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -50,18 +50,9 @@
     <color name="search_shortcut_background_color">#b6b6b6</color>
     <color name="search_shortcut_icon_color">#f8f8f8</color>
 
-    <!-- Dark variant of the action bar color. -->
-    <color name="actionbar_background_color_dark">#008aa1</color>
-
     <!-- Color of the 1dp divider that separates favorites -->
     <color name="favorite_contacts_separator_color">#d0d0d0</color>
 
-    <!-- Background color of the search box -->
-    <color name="searchbox_background_color">#ffffff</color>
-    <!-- Text color of the search box text as entered by user  -->
-    <color name="searchbox_text_color">#000000</color>
-    <!-- Text color of the search box hint text  -->
-    <color name="searchbox_hint_text_color">#a4a4a4</color>
     <color name="searchbox_icon_tint">#a4a4a4</color>
 
     <!-- Color of the contact name in favorite tiles -->
@@ -97,9 +88,6 @@
     <!-- Color for answered or outgoing call icons. -->
     <color name="answered_call">#2aad6f</color>
 
-    <!-- Color for icons in the actionbar -->
-    <color name="actionbar_icon_color">#ffffff</color>
-
     <color name="dialer_dialpad_touch_tint">#1a1dc7db</color>
 
     <color name="tab_ripple_color">@color/dialer_accent_color</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7a63321e1..4520a043a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,10 +15,6 @@
   ~ limitations under the License
 -->
 <resources>
-
-    <!--  Search View -->
-    <dimen name="search_text_size">14sp</dimen>
-
     <!--
           Drag to remove view (in dp because it is used in conjunction with a statically
           sized icon
@@ -102,19 +98,11 @@
     <dimen name="search_top_margin">8dp</dimen>
     <!-- Margin below the search box. -->
     <dimen name="search_bottom_margin">8dp</dimen>
-    <!-- Search box text size -->
-    <dimen name="search_text_size">13.24sp</dimen>
     <!-- Search box interior padding - left -->
     <dimen name="search_box_left_padding">8dp</dimen>
     <!-- Search box interior padding - right -->
     <dimen name="search_box_right_padding">8dp</dimen>
-    <!-- Padding around the icon in the search box. -->
-    <dimen name="search_box_icon_margin">4dp</dimen>
     <dimen name="search_box_search_icon_padding">4dp</dimen>
-    <!-- Left margin of the text field in the search box. -->
-    <dimen name="search_box_text_left_margin">27dp</dimen>
-    <!-- Size of the icon (voice search, close search) in the search box. -->
-    <dimen name="search_box_icon_size">28dp</dimen>
     <!-- Elevation of the search box -->
     <dimen name="search_box_elevation">3dp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0cf4e2532..8f083c885 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -460,9 +460,6 @@
     -->
     <string name="description_call_log_unheard_voicemail">Unheard voicemail</string>
 
-    <!--  String describing the icon used to clear the search field -->
-    <string name="description_clear_search">Clear search</string>
-
     <!-- String describing the icon used to start a voice search -->
     <string name="description_start_voice_search">Start voice search</string>
 
@@ -635,10 +632,6 @@
          Do not translate. -->
     <string name="favorites_menu_all_contacts_font_family">sans-serif</string>
 
-    <!-- The font-family to use for the text inside the searchbox.
-         Do not translate. -->
-    <string name="search_font_family">sans-serif</string>
-
     <!-- Button text for the "call back" button displayed underneath an entry in the call log.
          Tapping causes a call to be placed to the caller represented by the call log entry.
          [CHAR LIMIT=30] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d41524f2b..6b4f41777 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -27,8 +27,6 @@
         <!--  Drawable for the back button -->
         <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
         <item name="android:windowContentOverlay">@null</item>
-        <!--  Searchbox Style -->
-        <item name="android:editTextStyle">@style/DialtactsSearchboxStyle</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="activated_background">@drawable/list_item_activated_background</item>
         <item name="section_header_background">@drawable/list_title_holo</item>
@@ -140,11 +138,6 @@
         <item name="android:overScrollMode">always</item>
     </style>
 
-    <style name="DialtactsSearchboxStyle" parent="@android:style/Widget.EditText">
-        <item name="android:background">@null</item>
-        <item name="android:textColorHint">@color/searchbox_text_color</item>
-    </style>
-
     <style name="DismissButtonStyle">
         <item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item>
         <item name="android:paddingRight">@dimen/dismiss_button_padding_end</item>