Merge "Put "show all folders" in action bar"

This commit is contained in:
Ben Komalo 2011-07-14 17:49:46 -07:00 committed by Android (Google) Code Review
commit 91f1d451a6
2 changed files with 13 additions and 1 deletions

View File

@ -33,9 +33,18 @@
android:icon="@drawable/ic_menu_compose_holo_light"
android:showAsAction="ifRoom"
/>
<!-- STOPSHIP: replace with proper asset -->
<item
android:id="@+id/show_all_mailboxes"
android:orderInCategory="300"
android:alphabeticShortcut="c"
android:title="@string/mailbox_list_account_selector_show_all_folders"
android:icon="@drawable/ic_menu_move_to_holo_light"
android:showAsAction="ifRoom"
/>
<item
android:id="@+id/refresh"
android:orderInCategory="300"
android:orderInCategory="400"
android:alphabeticShortcut="r"
android:title="@string/refresh_action"
android:icon="@drawable/ic_menu_refresh_holo_light"

View File

@ -602,6 +602,9 @@ class UIControllerOnePane extends UIControllerBase {
case R.id.older:
moveToOlder();
return true;
case R.id.show_all_mailboxes:
showAllMailboxes();
return true;
}
return super.onOptionsItemSelected(item);
}