Make actions ifRoom
Make more room when the search field or search results are shown. Has
the happy side effect of making portrait search results menu the same
as the phone version of the file.
Bug: 8725516 Search box is truncated by show-always action buttons
Change-Id: I6ea467a64a646f4c60c9677e6afe2aa921c36e18
diff --git a/res/menu-sw600dp-port/conversation_list_search_results_actions.xml b/res/menu-sw600dp-port/conversation_list_search_results_actions.xml
deleted file mode 100644
index ba722e6..0000000
--- a/res/menu-sw600dp-port/conversation_list_search_results_actions.xml
+++ /dev/null
@@ -1,54 +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.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:id="@+id/compose"
- android:title="@string/menu_compose"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_compose_normal_holo_light"
- android:alphabeticShortcut="@string/trigger_compose_char" />
-
- <item android:id="@+id/search"
- android:title="@string/menu_search"
- android:showAsAction="always|collapseActionView"
- android:icon="@drawable/ic_menu_search_holo_light"
- android:actionLayout="@layout/mail_actionbar_searchview" />
-
- <item android:id="@+id/refresh"
- android:title="@string/refresh"
- android:showAsAction="never"
- android:icon="@drawable/ic_menu_refresh_holo_light"
- android:alphabeticShortcut="@string/trigger_refresh_char" />
-
- <item android:id="@+id/settings"
- android:title="@string/menu_settings"
- android:showAsAction="never" />
-
- <item
- android:id="@+id/feedback_menu_item"
- android:icon="@android:drawable/ic_menu_send"
- android:showAsAction="never"
- android:title="@string/feedback" />
-
- <item
- android:id="@+id/help_info_menu_item"
- android:icon="@android:drawable/ic_menu_help"
- android:showAsAction="never"
- android:title="@string/help_and_info" />
-
-</menu>
diff --git a/res/menu/conversation_list_search_results_actions.xml b/res/menu/conversation_list_search_results_actions.xml
index ab699d3..15769c9 100644
--- a/res/menu/conversation_list_search_results_actions.xml
+++ b/res/menu/conversation_list_search_results_actions.xml
@@ -20,19 +20,19 @@
<item android:id="@+id/compose"
android:title="@string/menu_compose"
- android:showAsAction="always"
+ android:showAsAction="ifRoom"
android:icon="@drawable/ic_menu_compose_normal_holo_light"
android:alphabeticShortcut="@string/trigger_compose_char" />
<item android:id="@+id/search"
android:title="@string/menu_search"
- android:showAsAction="always|collapseActionView"
+ android:showAsAction="ifRoom|collapseActionView"
android:icon="@drawable/ic_menu_search_holo_light"
android:actionLayout="@layout/mail_actionbar_searchview" />
<item android:id="@+id/refresh"
android:title="@string/refresh"
- android:showAsAction="ifRoom"
+ android:showAsAction="never"
android:icon="@drawable/ic_menu_refresh_holo_light"
android:alphabeticShortcut="@string/trigger_refresh_char" />