Remove "Show all labels"
Bug: 8776309
Change-Id: I25518d36b9abf1c5294ba5eb74fccb44d18636b1
diff --git a/res/layout/account_switch_spinner_dropdown_footer.xml b/res/layout/account_switch_spinner_dropdown_footer.xml
deleted file mode 100644
index 342e1b7..0000000
--- a/res/layout/account_switch_spinner_dropdown_footer.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2011 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.
--->
-
-<!-- The footer in the dropdown list that says "Show all labels" -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- style="?android:attr/spinnerDropDownItemStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:minHeight="@dimen/account_dropdown_item_height">
- <TextView
- android:singleLine="true"
- android:layout_height="match_parent"
- android:layout_width="wrap_content"
- android:layout_centerVertical="true"
- android:ellipsize="end"
- android:gravity="center_vertical"
- android:text="@string/show_all_folders"
- style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title" />
-</LinearLayout>
diff --git a/res/menu/conversation_list_menu.xml b/res/menu/conversation_list_menu.xml
index 99b9db2..efb638f 100644
--- a/res/menu/conversation_list_menu.xml
+++ b/res/menu/conversation_list_menu.xml
@@ -44,12 +44,6 @@
android:icon="@drawable/ic_menu_trash_holo_light" />
<!-- Always available -->
- <item android:id="@+id/show_all_folders"
- android:title="@string/show_all_folders"
- android:showAsAction="never"
- android:icon="@drawable/ic_menu_folders_holo_light" />
-
- <!-- Always available -->
<item android:id="@+id/refresh"
android:title="@string/refresh"
android:showAsAction="never"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7b6f05e..e7a7665 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -357,8 +357,6 @@
<string name="send_failed">Message wasn\'t sent.</string>
<!-- Strings used to show myself in a To/Cc list. [CHAR LIMIT=15] -->
<string name="me">me</string>
- <!-- List item to open folders view in account dropdown [CHAR LIMIT=50] -->
- <string name="show_all_folders">Show all folders</string>
<!-- Header for list of inboxes in the drawer (Inbox, Priority) [CHAR LIMIT=50] -->
<string name="inbox_folders_heading">Inbox</string>
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 403785e..01b5b9a 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -1160,9 +1160,6 @@
case R.id.compose:
ComposeActivity.compose(mActivity.getActivityContext(), mAccount);
break;
- case R.id.show_all_folders:
- toggleFolderListState();
- break;
case R.id.refresh:
requestFolderRefresh();
break;