PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5ae0b304: am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"

Browse Source 
* commit '5ae0b304a9cda254239c5fdfd12a744bda191e2c':
  Fix switching running/cached apps with memory bar
This commit is contained in:
Amith Yamasani
2013-12-04 21:14:44 +00:00
committed by Android Git Automerger
parent 482b34eaad 5ae0b304a9
commit eba89f4fae
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/applications/ManageApplications.java
View File

@@ -1085,6 +1085,7 @@ public class ManageApplications extends Fragment implements
mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(showingBackground); mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(showingBackground);
mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground); mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
mOptionsMenu.findItem(RESET_APP_PREFERENCES).setVisible(false); mOptionsMenu.findItem(RESET_APP_PREFERENCES).setVisible(false);
mShowBackground = showingBackground;
} else { } else {
mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA); mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE); mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);

6
src/com/android/settings/applications/RunningProcessesView.java
View File

@@ -434,6 +434,9 @@ public class RunningProcessesView extends FrameLayout
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mAdapter.setShowBackground(true); mAdapter.setShowBackground(true);
if (mOwner != null) {
mOwner.getActivity().invalidateOptionsMenu();
}
} }
}); });
mForegroundProcessText = (TextView)findViewById(R.id.foregroundText); mForegroundProcessText = (TextView)findViewById(R.id.foregroundText);
@@ -441,6 +444,9 @@ public class RunningProcessesView extends FrameLayout
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mAdapter.setShowBackground(false); mAdapter.setShowBackground(false);
if (mOwner != null) {
mOwner.getActivity().invalidateOptionsMenu();
}
} }
}); });