commit 854533a82d5cfeac27e80b610544291c5be4fa39
author Jason Monk <jmonk@google.com> Wed Aug 05 20:44:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 05 20:44:41 2015 +0000
tree f36038f59c76d5a625aa80658415c77a2c01a140
parent 95a524a4ffd2da1873b9ac023f985afac4691b82
parent 5b12cb7712d85025c93ad941b0694916c0566a37

am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '5b12cb7712d85025c93ad941b0694916c0566a37':
  Hide show/hide system from battery optimizations 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 44ced66..8d5679f 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -553,8 +553,10 @@
         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