diff options
Diffstat (limited to 'res')
43 files changed, 272 insertions, 103 deletions
diff --git a/res/drawable-hdpi/ic_arrow_back_24dp.png b/res/drawable-hdpi/ic_arrow_back_24dp.png Binary files differnew file mode 100644 index 000000000..9b5f436f6 --- /dev/null +++ b/res/drawable-hdpi/ic_arrow_back_24dp.png diff --git a/res/drawable-hdpi/ic_close_24dp.png b/res/drawable-hdpi/ic_close_24dp.png Binary files differnew file mode 100644 index 000000000..33db9eef6 --- /dev/null +++ b/res/drawable-hdpi/ic_close_24dp.png diff --git a/res/drawable-hdpi/ic_history_24dp.png b/res/drawable-hdpi/ic_history_24dp.png Binary files differnew file mode 100644 index 000000000..b93e92940 --- /dev/null +++ b/res/drawable-hdpi/ic_history_24dp.png diff --git a/res/drawable-hdpi/ic_history_holo_light.png b/res/drawable-hdpi/ic_history_holo_light.png Binary files differdeleted file mode 100644 index d3feeac20..000000000 --- a/res/drawable-hdpi/ic_history_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_mic_24dp.png b/res/drawable-hdpi/ic_mic_24dp.png Binary files differnew file mode 100644 index 000000000..143ccc43a --- /dev/null +++ b/res/drawable-hdpi/ic_mic_24dp.png diff --git a/res/drawable-mdpi/ic_arrow_back_24dp.png b/res/drawable-mdpi/ic_arrow_back_24dp.png Binary files differnew file mode 100644 index 000000000..3a5800d1e --- /dev/null +++ b/res/drawable-mdpi/ic_arrow_back_24dp.png diff --git a/res/drawable-mdpi/ic_close_24dp.png b/res/drawable-mdpi/ic_close_24dp.png Binary files differnew file mode 100644 index 000000000..bd39f9332 --- /dev/null +++ b/res/drawable-mdpi/ic_close_24dp.png diff --git a/res/drawable-mdpi/ic_history_24dp.png b/res/drawable-mdpi/ic_history_24dp.png Binary files differnew file mode 100644 index 000000000..76b0a9178 --- /dev/null +++ b/res/drawable-mdpi/ic_history_24dp.png diff --git a/res/drawable-mdpi/ic_history_holo_light.png b/res/drawable-mdpi/ic_history_holo_light.png Binary files differdeleted file mode 100644 index 2b6eec4f5..000000000 --- a/res/drawable-mdpi/ic_history_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_mic_24dp.png b/res/drawable-mdpi/ic_mic_24dp.png Binary files differnew file mode 100644 index 000000000..81d0c21ad --- /dev/null +++ b/res/drawable-mdpi/ic_mic_24dp.png diff --git a/res/drawable-xhdpi/ic_arrow_back_24dp.png b/res/drawable-xhdpi/ic_arrow_back_24dp.png Binary files differnew file mode 100644 index 000000000..73395b0ac --- /dev/null +++ b/res/drawable-xhdpi/ic_arrow_back_24dp.png diff --git a/res/drawable-xhdpi/ic_close_24dp.png b/res/drawable-xhdpi/ic_close_24dp.png Binary files differnew file mode 100644 index 000000000..81efb7040 --- /dev/null +++ b/res/drawable-xhdpi/ic_close_24dp.png diff --git a/res/drawable-xhdpi/ic_history_24dp.png b/res/drawable-xhdpi/ic_history_24dp.png Binary files differnew file mode 100644 index 000000000..61c0bfe34 --- /dev/null +++ b/res/drawable-xhdpi/ic_history_24dp.png diff --git a/res/drawable-xhdpi/ic_history_holo_light.png b/res/drawable-xhdpi/ic_history_holo_light.png Binary files differdeleted file mode 100644 index 83d61fa68..000000000 --- a/res/drawable-xhdpi/ic_history_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_mic_24dp.png b/res/drawable-xhdpi/ic_mic_24dp.png Binary files differnew file mode 100644 index 000000000..1dcf56c4e --- /dev/null +++ b/res/drawable-xhdpi/ic_mic_24dp.png diff --git a/res/drawable-xxhdpi/ic_arrow_back_24dp.png b/res/drawable-xxhdpi/ic_arrow_back_24dp.png Binary files differnew file mode 100644 index 000000000..650351d06 --- /dev/null +++ b/res/drawable-xxhdpi/ic_arrow_back_24dp.png diff --git a/res/drawable-xxhdpi/ic_close_24dp.png b/res/drawable-xxhdpi/ic_close_24dp.png Binary files differnew file mode 100644 index 000000000..0924e29a2 --- /dev/null +++ b/res/drawable-xxhdpi/ic_close_24dp.png diff --git a/res/drawable-xxhdpi/ic_history_24dp.png b/res/drawable-xxhdpi/ic_history_24dp.png Binary files differnew file mode 100644 index 000000000..4fe0a7efe --- /dev/null +++ b/res/drawable-xxhdpi/ic_history_24dp.png diff --git a/res/drawable-xxhdpi/ic_history_holo_light.png b/res/drawable-xxhdpi/ic_history_holo_light.png Binary files differdeleted file mode 100644 index b5e82bc69..000000000 --- a/res/drawable-xxhdpi/ic_history_holo_light.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_mic_24dp.png b/res/drawable-xxhdpi/ic_mic_24dp.png Binary files differnew file mode 100644 index 000000000..ce9890478 --- /dev/null +++ b/res/drawable-xxhdpi/ic_mic_24dp.png diff --git a/res/drawable-xxxhdpi/ic_arrow_back_24dp.png b/res/drawable-xxxhdpi/ic_arrow_back_24dp.png Binary files differnew file mode 100644 index 000000000..8068c1b57 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_arrow_back_24dp.png diff --git a/res/drawable-xxxhdpi/ic_close_24dp.png b/res/drawable-xxxhdpi/ic_close_24dp.png Binary files differnew file mode 100644 index 000000000..cb7a27ca8 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_close_24dp.png diff --git a/res/drawable-xxxhdpi/ic_history_24dp.png b/res/drawable-xxxhdpi/ic_history_24dp.png Binary files differnew file mode 100644 index 000000000..420576b08 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_history_24dp.png diff --git a/res/drawable-xxxhdpi/ic_mic_24dp.png b/res/drawable-xxxhdpi/ic_mic_24dp.png Binary files differnew file mode 100644 index 000000000..c586bb535 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_mic_24dp.png diff --git a/res/values-sw600dp-land/dimen.xml b/res/drawable/action_bar_shadow.xml index 92359cbf0..32501171d 100644 --- a/res/values-sw600dp-land/dimen.xml +++ b/res/drawable/action_bar_shadow.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2012 Google Inc. + Copyright (C) 2014 Google Inc. Licensed to The Android Open Source Project. Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,6 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources> - <dimen name="search_view_width">500dip</dimen> -</resources> + +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <gradient + android:angle="270" + android:startColor="#3D000000" + android:endColor="#00000000" /> +</shape> diff --git a/res/layout/mail_actionbar_searchview.xml b/res/layout/mail_actionbar_searchview.xml index 730f1708a..b7bc1e662 100644 --- a/res/layout/mail_actionbar_searchview.xml +++ b/res/layout/mail_actionbar_searchview.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2011 Google Inc. + Copyright (C) 2014 Google Inc. Licensed to The Android Open Source Project. Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,12 +16,44 @@ limitations under the License. --> -<android.support.v7.widget.SearchView +<com.android.mail.ui.MaterialSearchActionView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/search_layout" - android:gravity="center_vertical" - android:layout_height="match_parent" + android:id="@+id/search_actionbar_view" android:layout_width="match_parent" - android:hint="@string/search_hint" - android:imeOptions="actionSearch" - android:maxWidth="@dimen/search_view_width" /> + android:layout_height="match_parent" + android:background="@android:color/white"> + + <ImageView + android:id="@+id/search_actionbar_back_button" + android:layout_width="@dimen/search_leading_button_width" + android:layout_height="match_parent" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/ic_arrow_back_24dp" + style="@style/SearchViewLeadingButton" /> + + <EditText + android:id="@+id/search_actionbar_query_text" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="@android:color/transparent" + android:gravity="center_vertical" + android:hint="@string/search_hint" + android:imeOptions="actionSearch|flagNoExtractUi" + android:inputType="text|textNoSuggestions" + android:singleLine="true" + android:textColor="@color/search_query_text" + android:textColorHint="@color/search_query_hint_text" + android:textSize="16sp" /> + + <ImageView + android:id="@+id/search_actionbar_ending_button" + android:layout_width="@dimen/search_ending_button_width" + android:layout_height="match_parent" + android:background="?android:attr/selectableItemBackground" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:scaleType="center" + android:src="@drawable/ic_mic_24dp" /> + +</com.android.mail.ui.MaterialSearchActionView>
\ No newline at end of file diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml index 478edb9a9..40072a2a8 100644 --- a/res/layout/one_pane_activity.xml +++ b/res/layout/one_pane_activity.xml @@ -16,7 +16,6 @@ --> <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_container" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -27,12 +26,8 @@ android:layout_height="match_parent" android:orientation="vertical"> - <android.support.v7.widget.Toolbar - android:id="@+id/mail_toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - app:theme="?attr/actionBarTheme" /> + <!-- Custom toolbar/search overlay --> + <include layout="@layout/toolbar_with_search" /> <FrameLayout android:layout_width="match_parent" @@ -47,6 +42,8 @@ <include layout="@layout/floating_actions" /> + <include layout="@layout/search_suggestion_list" /> + </FrameLayout> </LinearLayout> @@ -57,4 +54,4 @@ android:layout_height="match_parent" android:layout_gravity="start" /> -</android.support.v4.widget.DrawerLayout> +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/res/layout/search_suggestion_item.xml b/res/layout/search_suggestion_item.xml new file mode 100644 index 000000000..49b0256c9 --- /dev/null +++ b/res/layout/search_suggestion_item.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 Google Inc. + Licensed to 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/search_suggestion_height" + android:orientation="vertical"> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:paddingRight="16dp"> + + <ImageView + android:id="@+id/search_overlay_item_icon" + android:layout_width="@dimen/search_leading_button_width" + android:layout_height="match_parent" + style="@style/SearchViewLeadingButton" /> + + <TextView + android:id="@+id/search_overlay_item_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:textColor="@color/search_suggestion_item_text" + android:textSize="16sp" /> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/search_suggestion_list.xml b/res/layout/search_suggestion_list.xml new file mode 100644 index 000000000..d024ccfe5 --- /dev/null +++ b/res/layout/search_suggestion_list.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 Google Inc. + Licensed to 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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.android.mail.ui.MaterialSearchSuggestionsList + android:id="@+id/search_overlay_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:visibility="gone"> + + <ListView + android:id="@+id/search_overlay_suggestion_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@android:color/white" + android:divider="@null" /> + + <!-- Scrim to fade the background --> + <View + android:id="@+id/search_overlay_scrim" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:background="#88000000" /> + + </com.android.mail.ui.MaterialSearchSuggestionsList> + + <!-- Search bar shadow --> + <View + android:id="@+id/search_actionbar_shadow" + android:layout_width="match_parent" + android:layout_height="7dp" + android:background="@drawable/action_bar_shadow" + android:visibility="gone" /> +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/toolbar_with_search.xml b/res/layout/toolbar_with_search.xml new file mode 100644 index 000000000..4e5abda14 --- /dev/null +++ b/res/layout/toolbar_with_search.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 Google Inc. + Licensed to 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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize"> + + <android.support.v7.widget.Toolbar + android:id="@+id/mail_toolbar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/colorPrimary" + app:theme="?attr/actionBarTheme" /> + + <include layout="@layout/mail_actionbar_searchview" /> + +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/two_pane_activity.xml b/res/layout/two_pane_activity.xml index 2f8f6db6e..eb194c96c 100644 --- a/res/layout/two_pane_activity.xml +++ b/res/layout/two_pane_activity.xml @@ -15,49 +15,68 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.mail.ui.TwoPaneLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/two_pane_activity" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/tablet_background_gray"> + android:orientation="vertical"> + <!-- Custom toolbar/search overlay --> + <include layout="@layout/toolbar_with_search" /> + + <!-- Main content --> <FrameLayout - android:id="@+id/drawer" - android:layout_width="@dimen/two_pane_drawer_width_open" - android:layout_height="match_parent" - android:layout_gravity="left"> + android:layout_width="match_parent" + android:layout_height="match_parent"> - <include layout="@layout/drawer_fragment" + <com.android.mail.ui.TwoPaneLayout + android:id="@+id/two_pane_activity" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:background="@color/tablet_background_gray"> - </FrameLayout> + <FrameLayout + android:id="@+id/drawer" + android:layout_width="@dimen/two_pane_drawer_width_open" + android:layout_height="match_parent" + android:layout_gravity="left"> - <FrameLayout - android:id="@+id/conversation_list_pane" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_gravity="left" - style="@style/TwoPaneConversationList" /> - - <com.android.mail.ui.ConversationViewFrame - android:id="@+id/conversation_pane" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_gravity="left"> - - <include layout="@layout/conversation_pager" - android:layout_width="match_parent" - android:layout_height="match_parent" /> + <include layout="@layout/drawer_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </FrameLayout> + + <FrameLayout + android:id="@+id/conversation_list_pane" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_gravity="left" + style="@style/TwoPaneConversationList" /> - </com.android.mail.ui.ConversationViewFrame> + <com.android.mail.ui.ConversationViewFrame + android:id="@+id/conversation_pane" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_gravity="left"> - <com.android.mail.ui.ConversationViewFrame - android:id="@+id/miscellaneous_pane" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_gravity="left" /> + <include layout="@layout/conversation_pager" + android:layout_width="match_parent" + android:layout_height="match_parent" /> - <include layout="@layout/floating_actions" /> + </com.android.mail.ui.ConversationViewFrame> + + <com.android.mail.ui.ConversationViewFrame + android:id="@+id/miscellaneous_pane" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_gravity="left" /> + + <include layout="@layout/floating_actions" /> + + </com.android.mail.ui.TwoPaneLayout> + + <include layout="@layout/search_suggestion_list" /> + + </FrameLayout> -</com.android.mail.ui.TwoPaneLayout> +</LinearLayout>
\ No newline at end of file diff --git a/res/menu-sw600dp-land/conversation_actions.xml b/res/menu-sw600dp-land/conversation_actions.xml index 78325b8ce..af888ddde 100644 --- a/res/menu-sw600dp-land/conversation_actions.xml +++ b/res/menu-sw600dp-land/conversation_actions.xml @@ -22,8 +22,7 @@ <item android:id="@+id/search" android:title="@string/menu_search" app:showAsAction="always|collapseActionView" - android:icon="@drawable/ic_menu_search" - app:actionLayout="@layout/mail_actionbar_searchview" /> + android:icon="@drawable/ic_menu_search" /> <item android:id="@+id/archive" diff --git a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml index 1b784bc56..1e465722d 100644 --- a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml +++ b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml @@ -21,8 +21,7 @@ <item android:id="@+id/search" android:title="@string/menu_search" app:showAsAction="always|collapseActionView" - android:icon="@drawable/ic_menu_search" - app:actionLayout="@layout/mail_actionbar_searchview" /> + android:icon="@drawable/ic_menu_search" /> <item android:id="@+id/delete" diff --git a/res/menu/conversation_list_menu.xml b/res/menu/conversation_list_menu.xml index 05568bc0d..8b7c59377 100644 --- a/res/menu/conversation_list_menu.xml +++ b/res/menu/conversation_list_menu.xml @@ -35,8 +35,7 @@ that supports FOLDER_SERVER_SEARCH --> <item android:id="@+id/search" android:title="@string/menu_search" app:showAsAction="ifRoom|collapseActionView" - android:icon="@drawable/ic_menu_search" - app:actionLayout="@layout/mail_actionbar_searchview" /> + android:icon="@drawable/ic_menu_search" /> <!-- These invisible menu item are used to enable keyboard shortcuts --> <item diff --git a/res/menu/conversation_list_search_results_actions.xml b/res/menu/conversation_list_search_results_actions.xml index 6708c8366..1205e9066 100644 --- a/res/menu/conversation_list_search_results_actions.xml +++ b/res/menu/conversation_list_search_results_actions.xml @@ -22,8 +22,7 @@ <item android:id="@+id/search" android:title="@string/menu_search" app:showAsAction="ifRoom|collapseActionView" - android:icon="@drawable/ic_menu_search" - app:actionLayout="@layout/mail_actionbar_searchview" /> + android:icon="@drawable/ic_menu_search" /> <!-- This invisible menu item is used to map CTRL-C to the compose action --> <item diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml index 047db0a6e..20b69bf32 100644 --- a/res/values-ldrtl/styles-ldrtl.xml +++ b/res/values-ldrtl/styles-ldrtl.xml @@ -396,6 +396,13 @@ <item name="android:paddingEnd">@dimen/undo_icon_padding_end</item> </style> + <style name="SearchViewLeadingButton"> + <item name="android:layout_gravity">center_vertical</item> + <item name="android:paddingStart">16dp</item> + <item name="android:paddingEnd">32dp</item> + <item name="android:scaleType">center</item> + </style> + <style name="AccountItemNameStyle"> <item name="android:paddingStart">@dimen/account_item_name_start_padding</item> <item name="android:paddingEnd">@dimen/account_item_name_end_padding</item> diff --git a/res/values-sw600dp/themes.xml b/res/values-sw600dp/themes.xml index 4909a9d81..d6babb92f 100644 --- a/res/values-sw600dp/themes.xml +++ b/res/values-sw600dp/themes.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="MailActivityTheme" parent="@style/UnifiedEmailTheme.Appcompat" /> - <!-- todo - comment out when theme exists --> <!--<style name="ShortcutWidgetTheme" parent="@style/Theme.Appcompat.Light.Dialog.MinWidth">--> <!--<item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item>--> diff --git a/res/values/colors.xml b/res/values/colors.xml index 73f685b3f..c3834a84d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -103,6 +103,9 @@ <color name="notification_icon_gmail_red">#da4336</color> <!-- Search colors --> + <color name="search_query_hint_text">@color/light_gray</color> + <color name="search_query_text">@color/text_color_black</color> + <color name="search_suggestion_item_text">@color/text_color_grey</color> <color name="search_banner_bg">#f6f6f6</color> <color name="search_banner_text">@color/text_color_grey</color> diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 458ae243b..6be9b7114 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -112,7 +112,6 @@ <dimen name="widget_margin_left">0dip</dimen> <dimen name="widget_margin_right">0dip</dimen> <dimen name="widget_margin_bottom">0dip</dimen> - <dimen name="search_view_width">400dip</dimen> <dimen name="wait_padding">16dp</dimen> <integer name="chips_max_lines">2</integer> <dimen name="tile_letter_font_size">24dp</dimen> @@ -154,6 +153,9 @@ <dimen name="widget_senders_padding_end">16dip</dimen> <dimen name="widget_attachment_padding_end">8dp</dimen> + <dimen name="search_leading_button_width">72dp</dimen> + <dimen name="search_ending_button_width">56dp</dimen> + <dimen name="search_suggestion_height">56dp</dimen> <dimen name="search_results_padding">16dp</dimen> <dimen name="search_banner_text_size">12sp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4b66b05f2..f0ce86f04 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -19,10 +19,6 @@ <!-- Names of packages and authorities that are common to all apps and read from resources --> - <!-- Name of the search suggestions authority that looks up recent suggestions. This - needs to be modified in AndroidManifest.xml and res/xml/searchable.xml as well. --> - <string name="suggestions_authority" translatable="false">com.android.mail.suggestionsprovider</string> - <!-- Layout tests strings --> <string name="mock_content_provider" translatable="false">Mock Content Provider</string> <string name="conversation_content_provider" translatable="false">Conversation Content Provider</string> @@ -607,9 +603,11 @@ <!-- Title of the search dialog --> <string name="search_title" translatable="false">Unified Email</string> <!-- Shown in light gray in the Search box when no text has been entered [CHAR LIMIT=20]--> - <string name="search_hint">Search mail</string> + <string name="search_hint">Search</string> <!-- Search Results: Text for status of the search when the results are completely loaded [CHAR LIMIT=10] --> <string name="search_results_loaded"><xliff:g id="searchCount">%1$d</xliff:g></string> + <!-- Voice search is not supported on this device [CHAR LIMIT=100] --> + <string name="voice_search_not_supported">Voice search is not supported on this device.</string> <!-- Shown in conversation list footer when application cannot make a connection [CHAR LIMIT=20]--> <string name="network_error">No connection</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 544fd24a0..4fca44e70 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -975,11 +975,11 @@ <item name="android:paddingRight">@dimen/undo_icon_padding_end</item> </style> - <style name="Theme.AppCompat.Translucent"> - <item name="android:windowBackground">@android:color/transparent</item> - <item name="android:colorBackgroundCacheHint">@null</item> - <item name="android:windowIsTranslucent">true</item> - <item name="android:windowAnimationStyle">@android:style/Animation</item> + <style name="SearchViewLeadingButton"> + <item name="android:layout_gravity">center_vertical</item> + <item name="android:paddingLeft">16dp</item> + <item name="android:paddingRight">32dp</item> + <item name="android:scaleType">center</item> </style> <style name="AccountItemNameStyle"> diff --git a/res/values/themes.xml b/res/values/themes.xml index c2edf9f5e..7fd779e47 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -45,4 +45,11 @@ <item name="android:windowNoDisplay">true</item> </style> + <style name="Theme.AppCompat.Translucent"> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowAnimationStyle">@android:style/Animation</item> + </style> + </resources>
\ No newline at end of file diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml deleted file mode 100644 index 5607f16cb..000000000 --- a/res/xml/searchable.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2012 Google Inc. - Licensed to 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. ---> - -<!-- Override the searchSuggestAuthority in the inheriting applications to point to the - correct package name.--> -<searchable xmlns:android="http://schemas.android.com/apk/res/android" - android:label="@string/search_title" - android:hint="@string/search_hint" - android:icon="@drawable/ic_menu_search" - android:searchSuggestIntentAction="android.intent.action.SEARCH" - android:searchSuggestAuthority="com.android.mail" - android:imeOptions="actionSearch" - android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" /> |
