commit 8d17bc8a431176c36971467d79f1fa80a1df1bf8
author Kenny Root <kroot@google.com> Wed Oct 13 19:15:02 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 13 19:15:02 2010 -0700
tree 392ce08f3eb94ef5e355ed7b42ac315196493c51
parent 56a52c5aec61eb390b9d98dcaf3042e094e588a2
parent 52e8542d9dfb9c0d9a3530df1d790a0275d27f31

am 52e8542d: am 737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread

Merge commit '52e8542d9dfb9c0d9a3530df1d790a0275d27f31'

* commit '52e8542d9dfb9c0d9a3530df1d790a0275d27f31':
  Don't show the sort menu for running process list

src/com/android/settings/applications/ManageApplications.java

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 @@
     
     @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;