diff options
| author | Kenny Root <kroot@google.com> | 2010-10-12 12:25:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-12 12:25:34 -0700 |
| commit | 737e91efb15fe5908781bc1cf446d28abc7726e8 (patch) | |
| tree | 7f9976b34b18ddb5c5d039c324e97dbc0746dcd4 | |
| parent | 1054e4890ae50d2550ee822f0680346f48d48c97 (diff) | |
| parent | 673085af9e5e040eb0109138e9cb6916fa4b88f0 (diff) | |
| download | packages_apps_settings-737e91efb15fe5908781bc1cf446d28abc7726e8.zip packages_apps_settings-737e91efb15fe5908781bc1cf446d28abc7726e8.tar.gz packages_apps_settings-737e91efb15fe5908781bc1cf446d28abc7726e8.tar.bz2 | |
Merge "Don't show the sort menu for running process list" into gingerbread
| -rw-r--r-- | src/com/android/settings/applications/ManageApplications.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 40f4ddd..1053d3b 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -614,6 +614,14 @@ public class ManageApplications extends TabActivity implements @Override public boolean onPrepareOptionsMenu(Menu menu) { + /* + * The running processes screen doesn't use the mApplicationsAdapter + * so bringing up this menu in that case doesn't make any sense. + */ + if (mCurView == VIEW_RUNNING) { + return false; + } + menu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA); menu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE); return true; |