Fix switching running/cached apps with memory bar

Fixes upstream issue #38735
http://code.google.com/p/android/issues/detail?id=38735

Ported from CM10
http://review.cyanogenmod.org/25775

This patch is already submitted to AOSP. No feedback from them yet.

Change-Id: I484e30d3fd4f5425e174911ae22bb2def170e6b8

2 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index b94d944..9a3459e 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -1053,6 +1053,7 @@ public class ManageApplications extends Fragment implements
             mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(showingBackground);
             mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
             mOptionsMenu.findItem(RESET_APP_PREFERENCES).setVisible(false);
+            mShowBackground = showingBackground;
         } else {
             mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
             mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 67221ae..6156fa4 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -430,6 +430,9 @@ public class RunningProcessesView extends FrameLayout
             @Override
             public void onClick(View v) {
                 mAdapter.setShowBackground(true);
+                if (mOwner != null) {
+                    mOwner.getActivity().invalidateOptionsMenu();
+                }
             }
         });
         mForegroundProcessText = (TextView)findViewById(R.id.foregroundText);
@@ -437,6 +440,9 @@ public class RunningProcessesView extends FrameLayout
             @Override
             public void onClick(View v) {
                 mAdapter.setShowBackground(false);
+                if (mOwner != null) {
+                    mOwner.getActivity().invalidateOptionsMenu();
+                }
             }
         });