commit e10f8528220fc4506ff6deee5c71ddab3da5e21d
author Amith Yamasani <yamasani@google.com> Wed Dec 04 19:17:33 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 04 19:17:33 2013 +0000
tree 153552906bea0a790fcd3282f2511ee21611c56d
parent f67aa3985d36cace1fbea2537bcdc97f8b6d81ef
parent eca1fc2cadb9c1f15ab042e2080a8b8eb40ab6fa

Merge "Fix switching running/cached apps with memory bar"

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 aa10c9e..0a1dcb1 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -1085,6 +1085,7 @@
             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);

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

diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 52c4841..8eb0496 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -434,6 +434,9 @@
             @Override
             public void onClick(View v) {
                 mAdapter.setShowBackground(true);
+                if (mOwner != null) {
+                    mOwner.getActivity().invalidateOptionsMenu();
+                }
             }
         });
         mForegroundProcessText = (TextView)findViewById(R.id.foregroundText);
@@ -441,6 +444,9 @@
             @Override
             public void onClick(View v) {
                 mAdapter.setShowBackground(false);
+                if (mOwner != null) {
+                    mOwner.getActivity().invalidateOptionsMenu();
+                }
             }
         });