From 5b60fdba81245056de69ecefbf6bb37c90c4978f Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Tue, 20 Mar 2018 13:05:22 -0700 Subject: Implement new BS warning / notification flow (2/2) Bug: 74120126 Test: Manual tests Change-Id: Ieea6ee97695cd5a30e55f5c6ccec8135ec2d0ef4 --- .../batterysaver/BatterySaverButtonPreferenceController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/com/android/settings/fuelgauge/batterysaver') diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index 1d427c9f95..b23a5f08a7 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java @@ -21,13 +21,13 @@ import android.os.PowerManager; import android.support.annotation.VisibleForTesting; import android.support.v7.preference.Preference; -import com.android.settings.fuelgauge.BatteryBroadcastReceiver; import com.android.settings.fuelgauge.BatterySaverReceiver; import com.android.settings.widget.TwoStateButtonPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import com.android.settingslib.fuelgauge.BatterySaverUtils; /** * Controller to update the battery saver button @@ -73,7 +73,8 @@ public class BatterySaverButtonPreferenceController extends @Override public void onButtonClicked(boolean stateOn) { - mPowerManager.setPowerSaveMode(stateOn); + // This screen already shows a warning, so we don't need another warning. + BatterySaverUtils.setPowerSaveMode(mContext, stateOn, /*needFirstTimeWarning*/ false); } @Override @@ -85,4 +86,4 @@ public class BatterySaverButtonPreferenceController extends public void onBatteryChanged(boolean pluggedIn) { setButtonEnabled(!pluggedIn); } -} \ No newline at end of file +} -- cgit v1.2.3