summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/applications
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-08-05 20:37:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-05 20:37:17 +0000
commit5b12cb7712d85025c93ad941b0694916c0566a37 (patch)
tree7a293373145ed37aed513ef3e162c92a1ea3084f /src/com/android/settings/applications
parenteb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee (diff)
parent150e60ca9ad594d36aa12b425836a7d61b68501c (diff)
downloadpackages_apps_Settings-5b12cb7712d85025c93ad941b0694916c0566a37.zip
packages_apps_Settings-5b12cb7712d85025c93ad941b0694916c0566a37.tar.gz
packages_apps_Settings-5b12cb7712d85025c93ad941b0694916c0566a37.tar.bz2
am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
* commit '150e60ca9ad594d36aa12b425836a7d61b68501c': Hide show/hide system from battery optimizations list
Diffstat (limited to 'src/com/android/settings/applications')
-rw-r--r--src/com/android/settings/applications/ManageApplications.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 44ced66..8d5679f 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -553,8 +553,10 @@ public class ManageApplications extends InstrumentedFragment
mOptionsMenu.findItem(R.id.sort_order_size).setVisible(mListType == LIST_TYPE_STORAGE
&& mSortOrder != R.id.sort_order_size);
- mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem);
- mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem);
+ mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem
+ && mListType != LIST_TYPE_HIGH_POWER);
+ mOptionsMenu.findItem(R.id.hide_system).setVisible(mShowSystem
+ && mListType != LIST_TYPE_HIGH_POWER);
}
@Override