Use BatterySaverReceiver in battery saver settings
Use this receiver to listen to following updates: 1. Plug state: if it is plugged in, disable this two state button, otherwise make it enabled 2. low power mode: If mode on, show "turn off" otherwise show "turn on" Bug: 72228477 Test: RunSettingsRoboTests Change-Id: Ib3d3df9f9a5fbac8b1b876c9e193beb75f522ebd
This commit is contained in:
@@ -69,7 +69,7 @@ public class BatterySaverReceiver extends BroadcastReceiver {
|
|||||||
mBatterySaverListener = lsn;
|
mBatterySaverListener = lsn;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface BatterySaverListener {
|
public interface BatterySaverListener {
|
||||||
void onPowerSaveModeChanged();
|
void onPowerSaveModeChanged();
|
||||||
void onBatteryChanged(boolean pluggedIn);
|
void onBatteryChanged(boolean pluggedIn);
|
||||||
}
|
}
|
||||||
|
@@ -22,6 +22,7 @@ import android.support.annotation.VisibleForTesting;
|
|||||||
import android.support.v7.preference.Preference;
|
import android.support.v7.preference.Preference;
|
||||||
|
|
||||||
import com.android.settings.fuelgauge.BatteryBroadcastReceiver;
|
import com.android.settings.fuelgauge.BatteryBroadcastReceiver;
|
||||||
|
import com.android.settings.fuelgauge.BatterySaverReceiver;
|
||||||
import com.android.settings.widget.TwoStateButtonPreferenceController;
|
import com.android.settings.widget.TwoStateButtonPreferenceController;
|
||||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
@@ -31,20 +32,19 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
|
|||||||
/**
|
/**
|
||||||
* Controller to update the battery saver button
|
* Controller to update the battery saver button
|
||||||
*/
|
*/
|
||||||
//TODO(b/72228477): disable the button if device is charging.
|
|
||||||
public class BatterySaverButtonPreferenceController extends
|
public class BatterySaverButtonPreferenceController extends
|
||||||
TwoStateButtonPreferenceController implements
|
TwoStateButtonPreferenceController implements
|
||||||
LifecycleObserver, OnStart, OnStop, BatteryBroadcastReceiver.OnBatteryChangedListener {
|
LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
|
||||||
private static final String KEY = "battery_saver_button_container";
|
private static final String KEY = "battery_saver_button_container";
|
||||||
private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
|
private BatterySaverReceiver mBatterySaverReceiver;
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
PowerManager mPowerManager;
|
PowerManager mPowerManager;
|
||||||
|
|
||||||
public BatterySaverButtonPreferenceController(Context context, Lifecycle lifecycle) {
|
public BatterySaverButtonPreferenceController(Context context, Lifecycle lifecycle) {
|
||||||
super(context, KEY);
|
super(context, KEY);
|
||||||
mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
|
mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
|
||||||
mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(context);
|
mBatterySaverReceiver = new BatterySaverReceiver(context);
|
||||||
mBatteryBroadcastReceiver.setBatteryChangedListener(this);
|
mBatterySaverReceiver.setBatterySaverListener(this);
|
||||||
if (lifecycle != null) {
|
if (lifecycle != null) {
|
||||||
lifecycle.addObserver(this);
|
lifecycle.addObserver(this);
|
||||||
}
|
}
|
||||||
@@ -52,19 +52,18 @@ public class BatterySaverButtonPreferenceController extends
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
mBatteryBroadcastReceiver.register();
|
mBatterySaverReceiver.setListening(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStop() {
|
public void onStop() {
|
||||||
mBatteryBroadcastReceiver.unRegister();
|
mBatterySaverReceiver.setListening(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateState(Preference preference) {
|
public void updateState(Preference preference) {
|
||||||
super.updateState(preference);
|
super.updateState(preference);
|
||||||
final boolean lowPowerModeOn = mPowerManager.isPowerSaveMode();
|
setButtonVisibility(!mPowerManager.isPowerSaveMode());
|
||||||
updateButton(!lowPowerModeOn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -72,14 +71,18 @@ public class BatterySaverButtonPreferenceController extends
|
|||||||
return AVAILABLE;
|
return AVAILABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBatteryChanged() {
|
|
||||||
final boolean lowPowerModeOn = mPowerManager.isPowerSaveMode();
|
|
||||||
updateButton(!lowPowerModeOn);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onButtonClicked(boolean stateOn) {
|
public void onButtonClicked(boolean stateOn) {
|
||||||
mPowerManager.setPowerSaveMode(stateOn);
|
mPowerManager.setPowerSaveMode(stateOn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPowerSaveModeChanged() {
|
||||||
|
setButtonVisibility(!mPowerManager.isPowerSaveMode());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBatteryChanged(boolean pluggedIn) {
|
||||||
|
setButtonEnabled(!pluggedIn);
|
||||||
|
}
|
||||||
}
|
}
|
@@ -47,7 +47,7 @@ public abstract class TwoStateButtonPreferenceController extends BasePreferenceC
|
|||||||
mButtonOff.setOnClickListener(this);
|
mButtonOff.setOnClickListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void updateButton(boolean stateOn) {
|
protected void setButtonVisibility(boolean stateOn) {
|
||||||
if (stateOn) {
|
if (stateOn) {
|
||||||
mButtonOff.setVisibility(View.GONE);
|
mButtonOff.setVisibility(View.GONE);
|
||||||
mButtonOn.setVisibility(View.VISIBLE);
|
mButtonOn.setVisibility(View.VISIBLE);
|
||||||
@@ -57,6 +57,11 @@ public abstract class TwoStateButtonPreferenceController extends BasePreferenceC
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void setButtonEnabled(boolean enabled) {
|
||||||
|
mButtonOn.setEnabled(enabled);
|
||||||
|
mButtonOff.setEnabled(enabled);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
final boolean stateOn = v.getId() == R.id.state_on_button;
|
final boolean stateOn = v.getId() == R.id.state_on_button;
|
||||||
|
@@ -67,21 +67,37 @@ public class TwoStateButtonPreferenceControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testUpdateButtons_stateOn_onlyShowButtonOn() {
|
public void testSetButtonVisibility_stateOn_onlyShowButtonOn() {
|
||||||
mController.updateButton(true /* stateOn */);
|
mController.setButtonVisibility(true /* stateOn */);
|
||||||
|
|
||||||
assertThat(mButtonOn.getVisibility()).isEqualTo(View.VISIBLE);
|
assertThat(mButtonOn.getVisibility()).isEqualTo(View.VISIBLE);
|
||||||
assertThat(mButtonOff.getVisibility()).isEqualTo(View.GONE);
|
assertThat(mButtonOff.getVisibility()).isEqualTo(View.GONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testUpdateButtons_stateOff_onlyShowButtonOff() {
|
public void testSetButtonVisibility_stateOff_onlyShowButtonOff() {
|
||||||
mController.updateButton(false /* stateOn */);
|
mController.setButtonVisibility(false /* stateOn */);
|
||||||
|
|
||||||
assertThat(mButtonOn.getVisibility()).isEqualTo(View.GONE);
|
assertThat(mButtonOn.getVisibility()).isEqualTo(View.GONE);
|
||||||
assertThat(mButtonOff.getVisibility()).isEqualTo(View.VISIBLE);
|
assertThat(mButtonOff.getVisibility()).isEqualTo(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSetButtonEnabled_enabled_buttonEnabled() {
|
||||||
|
mController.setButtonEnabled(true /* enabled */);
|
||||||
|
|
||||||
|
assertThat(mButtonOn.isEnabled()).isTrue();
|
||||||
|
assertThat(mButtonOff.isEnabled()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSetButtonEnabled_disabled_buttonDisabled() {
|
||||||
|
mController.setButtonEnabled(false /* enabled */);
|
||||||
|
|
||||||
|
assertThat(mButtonOn.isEnabled()).isFalse();
|
||||||
|
assertThat(mButtonOff.isEnabled()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Controller to test methods in {@link TwoStateButtonPreferenceController}
|
* Controller to test methods in {@link TwoStateButtonPreferenceController}
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user