From c01d92982d1397aafb82ce10542f69f179210d0b Mon Sep 17 00:00:00 2001 From: Wesley Wang Date: Thu, 6 Apr 2023 17:11:23 +0800 Subject: [PATCH] Add manual enabled battery saver reason (2/4) Bug: 218405966 Test: make SettingsRoboTests Change-Id: Ifd51cde5abbbd731c24bf677ca1c525ffd6993a3 --- .../settings/fuelgauge/BatterySaverModeVoiceActivity.java | 4 +++- .../batterysaver/BatterySaverButtonPreferenceController.java | 4 +++- .../fuelgauge/batterytip/actions/BatterySaverAction.java | 5 ++++- .../conditional/BatterySaverConditionController.java | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java b/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java index 04624bb8c75..c4e5ce68814 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverModeVoiceActivity.java +++ b/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"); diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index 73ec42bad82..be364eee48e 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java index 0a92215aea1..6f823e97746 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java +++ b/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); } diff --git a/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java index b90c1b5c417..416b6908744 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java +++ b/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