DO NOT MERGE Settings changes for extreme battery saver

- Add "100%" to auto-battery saver setting
- Add shortcut to "running services".

Test: Manual
Bug: 64976537
Change-Id: I3eec1bc3c27a2f172a023680351b39c23a41da9f
(cherry picked from commit ef1861a57f29dec5860c8d0333a38092bf4dda61)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c71c4f..2adcd52 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1163,6 +1163,20 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name="Settings$RealRunningServicesActivity"
+            android:label="@string/runningservices_settings_title"
+            android:taskAffinity="com.android.settings"
+            android:parentActivityName="Settings">
+            <intent-filter>
+                <action android:name="android.intent.action.settings.RUNNING_SERVICES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.RunningServices" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+        </activity>
+
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
         <activity android:name="Settings$StorageUseActivity"
                 android:label="@string/storageuse_settings_title"

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5e1a468..8b42a5c 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -972,6 +972,7 @@
         <item>0</item>
         <item>5</item>
         <item>15</item>
+        <item>100</item>
     </integer-array>
 
     <!-- Process stats memory use details: labels for memory states -->

diff --git a/res/xml/shortcuts.xml b/res/xml/shortcuts.xml
index afb2104..8b0446c 100644 (file)
--- a/res/xml/shortcuts.xml
+++ b/res/xml/shortcuts.xml
@@ -36,4 +36,10 @@
         android:shortcutShortLabel="@string/power_usage_summary_title" >
         <intent android:action="android.intent.action.POWER_USAGE_SUMMARY" />
     </shortcut>
+    <shortcut
+        android:shortcutId="manifest-running-services"
+        android:icon="@drawable/ic_launcher_settings"
+        android:shortcutShortLabel="@string/show_running_services" >
+        <intent android:action="android.intent.action.settings.RUNNING_SERVICES"/>
+    </shortcut>
 </shortcuts>
\ No newline at end of file

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ee041e8..a79a249 100644 (file)
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -82,6 +82,7 @@ public class Settings extends SettingsActivity {
     public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
     public static class FactoryResetActivity extends SettingsActivity { /* empty */ }
     public static class RunningServicesActivity extends SettingsActivity { /* empty */ }
+    public static class RealRunningServicesActivity extends SettingsActivity { /* empty */ }
     public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }
     public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }

diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 380c070..c47df98 100644 (file)
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -52,6 +52,7 @@ import com.android.settings.applications.PictureInPictureDetails;
 import com.android.settings.applications.PictureInPictureSettings;
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
+import com.android.settings.applications.RunningServices;
 import com.android.settings.applications.SpecialAccessSettings;
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.VrListenerSettings;
@@ -139,6 +140,7 @@ public class SettingsGateway {
      * security exception if the fragment it needs to display is not in this list.
      */
     public static final String[] ENTRY_FRAGMENTS = {
+            RunningServices.class.getName(),
             WifiSettings.class.getName(),
             ConfigureWifiSettings.class.getName(),
             SavedAccessPointsWifiSettings.class.getName(),

diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 88dab49..35225c3 100644 (file)
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -87,7 +87,7 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
                 getResources().getIntArray(R.array.battery_saver_trigger_values)) {
             @Override
             protected String getCaption(Resources res, int value) {
-                if (value > 0 && value < 100) {
+                if (value > 0 && value <= 100) {
                     return res.getString(R.string.battery_saver_turn_on_automatically_pct,
                                          Utils.formatPercentage(value));
                 }