diff options
author | Brian Attwell <brianattwell@google.com> | 2014-05-30 17:16:08 -0700 |
---|---|---|
committer | Brian Attwell <brianattwell@google.com> | 2014-05-30 17:16:08 -0700 |
commit | 70c91b71393efc7f133677460749869608c5149d (patch) | |
tree | 2a87b7b7138023ba18b6b56bce3e4998e0e34e52 /res | |
parent | 982342df9ac866f298026a2baaa9d5956aada869 (diff) |
Removed search_bar_expanded from Dialer
The search_bar_expanded now belongs inside ContactsCommon.
Change-Id: If359d08a2742d718a35d526f44fb64ae6d0707cf
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_arrow_back_24dp.png | bin | 234 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_close_dk.png | bin | 956 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_arrow_back_24dp.png | bin | 213 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_close_dk.png | bin | 839 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_arrow_back_24dp.png | bin | 258 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_close_dk.png | bin | 1347 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_arrow_back_24dp.png | bin | 302 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_close_dk.png | bin | 1627 -> 0 bytes | |||
-rw-r--r-- | res/drawable/ic_back_arrow.xml | 20 | ||||
-rw-r--r-- | res/layout/search_edittext.xml | 41 | ||||
-rw-r--r-- | res/values/colors.xml | 12 | ||||
-rw-r--r-- | res/values/dimens.xml | 12 | ||||
-rw-r--r-- | res/values/strings.xml | 7 | ||||
-rw-r--r-- | res/values/styles.xml | 7 |
14 files changed, 1 insertions, 98 deletions
diff --git a/res/drawable-hdpi/ic_arrow_back_24dp.png b/res/drawable-hdpi/ic_arrow_back_24dp.png Binary files differdeleted file mode 100644 index 86cb89463..000000000 --- a/res/drawable-hdpi/ic_arrow_back_24dp.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_close_dk.png b/res/drawable-hdpi/ic_close_dk.png Binary files differdeleted file mode 100644 index f5e378fbc..000000000 --- a/res/drawable-hdpi/ic_close_dk.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_arrow_back_24dp.png b/res/drawable-mdpi/ic_arrow_back_24dp.png Binary files differdeleted file mode 100644 index dc81cd1d4..000000000 --- a/res/drawable-mdpi/ic_arrow_back_24dp.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_close_dk.png b/res/drawable-mdpi/ic_close_dk.png Binary files differdeleted file mode 100644 index 13f68ee36..000000000 --- a/res/drawable-mdpi/ic_close_dk.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_arrow_back_24dp.png b/res/drawable-xhdpi/ic_arrow_back_24dp.png Binary files differdeleted file mode 100644 index 4f4fbaa2d..000000000 --- a/res/drawable-xhdpi/ic_arrow_back_24dp.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_close_dk.png b/res/drawable-xhdpi/ic_close_dk.png Binary files differdeleted file mode 100644 index 4f965fe6b..000000000 --- a/res/drawable-xhdpi/ic_close_dk.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_arrow_back_24dp.png b/res/drawable-xxhdpi/ic_arrow_back_24dp.png Binary files differdeleted file mode 100644 index 46e90f735..000000000 --- a/res/drawable-xxhdpi/ic_arrow_back_24dp.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_close_dk.png b/res/drawable-xxhdpi/ic_close_dk.png Binary files differdeleted file mode 100644 index 2472da836..000000000 --- a/res/drawable-xxhdpi/ic_close_dk.png +++ /dev/null diff --git a/res/drawable/ic_back_arrow.xml b/res/drawable/ic_back_arrow.xml deleted file mode 100644 index 68a875ded..000000000 --- a/res/drawable/ic_back_arrow.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2014 The Android Open Source Project - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License - --> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_arrow_back_24dp" - android:autoMirrored="true" - android:tint="@color/actionbar_icon_color" />
\ No newline at end of file diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml index 50cbf5af9..ce8568681 100644 --- a/res/layout/search_edittext.xml +++ b/res/layout/search_edittext.xml @@ -76,45 +76,6 @@ </LinearLayout> - <LinearLayout - android:id="@+id/search_box_expanded" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:gravity="center_vertical" - android:visibility="gone" > - - <ImageButton - android:id="@+id/search_back_button" - android:layout_width="@dimen/search_box_icon_size" - android:layout_height="@dimen/search_box_icon_size" - android:layout_margin="@dimen/search_box_icon_margin" - android:src="@drawable/ic_back_arrow" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/action_menu_overflow_description" - android:tint="@color/actionbar_background_color" /> - - <EditText - android:id="@+id/search_view" - android:layout_width="0dp" - android:layout_height="@dimen/search_box_icon_size" - android:layout_weight="1" - android:layout_marginLeft="@dimen/search_box_text_left_margin" - android:textSize="@dimen/search_text_size" - android:fontFamily="@string/search_font_family" - android:textColor="@color/searchbox_text_color" - android:inputType="textFilter" /> - - <ImageView - android:id="@+id/search_close_button" - android:layout_height="@dimen/search_box_icon_size" - android:layout_width="@dimen/search_box_icon_size" - android:layout_margin="@dimen/search_box_icon_margin" - android:src="@drawable/ic_close_dk" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/description_clear_search" /> - - </LinearLayout> + <include layout="@layout/search_bar_expanded" /> </view>
\ No newline at end of file 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 1044a1eba..a45f83f17 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> @@ -157,11 +155,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> |