Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: If863d983c5f72cca4ae6a4c7c6afb47239f3be3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java

@@ -18,6 +18,8 @@ package com.android.settings.fuelgauge;
 
 import static android.provider.Settings.EXTRA_BATTERY_SAVER_MODE_ENABLED;
 
+import static com.android.settingslib.fuelgauge.BatterySaverLogging.SAVER_ENABLED_VOICE;
+
 import android.content.Intent;
 import android.util.Log;
 
@@ -36,7 +38,7 @@ public class BatterySaverModeVoiceActivity extends VoiceSettingsActivity {
         if (intent.hasExtra(EXTRA_BATTERY_SAVER_MODE_ENABLED)) {
             if (BatterySaverUtils.setPowerSaveMode(this,
                     intent.getBooleanExtra(EXTRA_BATTERY_SAVER_MODE_ENABLED, false),
-                    /*needFirstTimeWarning=*/ true)) {
+                    /*needFirstTimeWarning=*/ true, SAVER_ENABLED_VOICE)) {
                 notifySuccess(null);
             } else {
                 Log.v(TAG, "Unable to set power mode");

src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.fuelgauge.batterysaver;
 
+import static com.android.settingslib.fuelgauge.BatterySaverLogging.SAVER_ENABLED_SETTINGS;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
@@ -103,7 +105,7 @@ public class BatterySaverButtonPreferenceController extends
     @Override
     public boolean setChecked(boolean stateOn) {
         return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,
-                false /* needFirstTimeWarning */);
+                false /* needFirstTimeWarning */, SAVER_ENABLED_SETTINGS);
     }
 
     @Override

src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.fuelgauge.batterytip.actions;
 
+import static com.android.settingslib.fuelgauge.BatterySaverLogging.SAVER_ENABLED_UNKNOWN;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 
@@ -31,7 +33,8 @@ public class BatterySaverAction extends BatteryTipAction {
      */
     @Override
     public void handlePositiveAction(int metricsKey) {
-        BatterySaverUtils.setPowerSaveMode(mContext, true, /*needFirstTimeWarning*/ true);
+        BatterySaverUtils.setPowerSaveMode(mContext, true, /*needFirstTimeWarning*/ true,
+                SAVER_ENABLED_UNKNOWN);
         mMetricsFeatureProvider.action(mContext,
                 SettingsEnums.ACTION_TIP_TURN_ON_BATTERY_SAVER, metricsKey);
     }

src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.homepage.contextualcards.conditional;
 
+import static com.android.settingslib.fuelgauge.BatterySaverLogging.SAVER_ENABLED_UNKNOWN;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.PowerManager;
@@ -68,7 +70,7 @@ public class BatterySaverConditionController implements ConditionalCardControlle
     @Override
     public void onActionClick() {
         BatterySaverUtils.setPowerSaveMode(mAppContext, false,
-                /*needFirstTimeWarning*/ false);
+                /*needFirstTimeWarning*/ false, SAVER_ENABLED_UNKNOWN);
     }
 
     @Override