Update battery saver column to PrimarySwitchPreference (1/2)
- Change battery saver entry column to new design Screenshot: https://screenshot.googleplex.com/9a9Gxm3McJVmLkD.png Bug: 177407113 Test: make RunSettingsRoboTests -j40 Change-Id: I513bc4371518645f4e725df27f2cb978cec284e8
This commit is contained in:
committed by
Wesley Wang
parent
428273765b
commit
8d9fe815b0
@@ -40,7 +40,7 @@
|
|||||||
android:title="@string/summary_placeholder"
|
android:title="@string/summary_placeholder"
|
||||||
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />
|
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />
|
||||||
|
|
||||||
<Preference
|
<com.android.settings.widget.PrimarySwitchPreference
|
||||||
android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
|
android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
|
||||||
android:key="battery_saver_summary"
|
android:key="battery_saver_summary"
|
||||||
android:title="@string/battery_saver"
|
android:title="@string/battery_saver"
|
||||||
|
@@ -15,37 +15,35 @@
|
|||||||
*/
|
*/
|
||||||
package com.android.settings.fuelgauge;
|
package com.android.settings.fuelgauge;
|
||||||
|
|
||||||
import android.content.ContentResolver;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.database.ContentObserver;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.Looper;
|
|
||||||
import android.os.PowerManager;
|
import android.os.PowerManager;
|
||||||
import android.provider.Settings;
|
|
||||||
import android.provider.Settings.Global;
|
|
||||||
|
|
||||||
import androidx.preference.Preference;
|
import androidx.annotation.VisibleForTesting;
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.core.TogglePreferenceController;
|
||||||
import com.android.settings.Utils;
|
import com.android.settings.widget.PrimarySwitchPreference;
|
||||||
import com.android.settings.core.BasePreferenceController;
|
|
||||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
import com.android.settingslib.core.lifecycle.events.OnStart;
|
import com.android.settingslib.core.lifecycle.events.OnStart;
|
||||||
import com.android.settingslib.core.lifecycle.events.OnStop;
|
import com.android.settingslib.core.lifecycle.events.OnStop;
|
||||||
import com.android.settingslib.fuelgauge.BatterySaverUtils;
|
import com.android.settingslib.fuelgauge.BatterySaverUtils;
|
||||||
|
|
||||||
public class BatterySaverController extends BasePreferenceController
|
/**
|
||||||
|
* Controller to update the battery saver entry preference.
|
||||||
|
*/
|
||||||
|
public class BatterySaverController extends TogglePreferenceController
|
||||||
implements LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
|
implements LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
|
||||||
private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
|
private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
|
||||||
private final BatterySaverReceiver mBatteryStateChangeReceiver;
|
private final BatterySaverReceiver mBatteryStateChangeReceiver;
|
||||||
private final PowerManager mPowerManager;
|
private final PowerManager mPowerManager;
|
||||||
private Preference mBatterySaverPref;
|
|
||||||
|
@VisibleForTesting
|
||||||
|
PrimarySwitchPreference mBatterySaverPref;
|
||||||
|
|
||||||
public BatterySaverController(Context context) {
|
public BatterySaverController(Context context) {
|
||||||
super(context, KEY_BATTERY_SAVER);
|
super(context, KEY_BATTERY_SAVER);
|
||||||
|
|
||||||
mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
|
mPowerManager = mContext.getSystemService(PowerManager.class);
|
||||||
mBatteryStateChangeReceiver = new BatterySaverReceiver(context);
|
mBatteryStateChangeReceiver = new BatterySaverReceiver(context);
|
||||||
mBatteryStateChangeReceiver.setBatterySaverListener(this);
|
mBatteryStateChangeReceiver.setBatterySaverListener(this);
|
||||||
BatterySaverUtils.revertScheduleToNoneIfNeeded(context);
|
BatterySaverUtils.revertScheduleToNoneIfNeeded(context);
|
||||||
@@ -69,60 +67,38 @@ public class BatterySaverController extends BasePreferenceController
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
mContext.getContentResolver().registerContentObserver(
|
|
||||||
Settings.Global.getUriFor(Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL)
|
|
||||||
, true, mObserver);
|
|
||||||
|
|
||||||
mBatteryStateChangeReceiver.setListening(true);
|
mBatteryStateChangeReceiver.setListening(true);
|
||||||
updateSummary();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStop() {
|
public void onStop() {
|
||||||
mContext.getContentResolver().unregisterContentObserver(mObserver);
|
|
||||||
mBatteryStateChangeReceiver.setListening(false);
|
mBatteryStateChangeReceiver.setListening(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public CharSequence getSummary() {
|
|
||||||
final ContentResolver resolver = mContext.getContentResolver();
|
|
||||||
final boolean isPowerSaveOn = mPowerManager.isPowerSaveMode();
|
|
||||||
final int percent = Settings.Global.getInt(resolver,
|
|
||||||
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
|
|
||||||
final int mode = Settings.Global.getInt(resolver,
|
|
||||||
Global.AUTOMATIC_POWER_SAVE_MODE, PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
|
|
||||||
if (isPowerSaveOn) {
|
|
||||||
return mContext.getString(R.string.battery_saver_on_summary);
|
|
||||||
} else if (mode == PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE) {
|
|
||||||
if (percent != 0) {
|
|
||||||
return mContext.getString(R.string.battery_saver_off_scheduled_summary,
|
|
||||||
Utils.formatPercentage(percent));
|
|
||||||
} else {
|
|
||||||
return mContext.getString(R.string.battery_saver_off_summary);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return mContext.getString(R.string.battery_saver_auto_routine);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateSummary() {
|
|
||||||
mBatterySaverPref.setSummary(getSummary());
|
|
||||||
}
|
|
||||||
|
|
||||||
private final ContentObserver mObserver = new ContentObserver(
|
|
||||||
new Handler(Looper.getMainLooper())) {
|
|
||||||
@Override
|
|
||||||
public void onChange(boolean selfChange) {
|
|
||||||
updateSummary();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPowerSaveModeChanged() {
|
public void onPowerSaveModeChanged() {
|
||||||
updateSummary();
|
final boolean isChecked = isChecked();
|
||||||
|
if (mBatterySaverPref != null && mBatterySaverPref.isChecked() != isChecked) {
|
||||||
|
mBatterySaverPref.setChecked(isChecked);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBatteryChanged(boolean pluggedIn) {
|
public void onBatteryChanged(boolean pluggedIn) {
|
||||||
|
if (mBatterySaverPref != null) {
|
||||||
|
mBatterySaverPref.setSwitchEnabled(!pluggedIn);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isChecked() {
|
||||||
|
return mPowerManager.isPowerSaveMode();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean setChecked(boolean stateOn) {
|
||||||
|
return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,
|
||||||
|
false /* needFirstTimeWarning */);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -17,15 +17,20 @@ package com.android.settings.fuelgauge;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
import static org.mockito.Mockito.spy;
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.PowerManager;
|
import android.os.PowerManager;
|
||||||
import android.provider.Settings;
|
import android.view.LayoutInflater;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.PreferenceViewHolder;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.widget.PrimarySwitchPreference;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
@@ -34,64 +39,108 @@ import org.mockito.Mock;
|
|||||||
import org.mockito.MockitoAnnotations;
|
import org.mockito.MockitoAnnotations;
|
||||||
import org.robolectric.RobolectricTestRunner;
|
import org.robolectric.RobolectricTestRunner;
|
||||||
import org.robolectric.RuntimeEnvironment;
|
import org.robolectric.RuntimeEnvironment;
|
||||||
import org.robolectric.util.ReflectionHelpers;
|
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
public class BatterySaverControllerTest {
|
public class BatterySaverControllerTest {
|
||||||
|
|
||||||
@Mock
|
|
||||||
private Preference mBatterySaverPref;
|
|
||||||
@Mock
|
@Mock
|
||||||
private PowerManager mPowerManager;
|
private PowerManager mPowerManager;
|
||||||
|
|
||||||
private BatterySaverController mBatterySaverController;
|
private BatterySaverController mBatterySaverController;
|
||||||
private Context mContext;
|
private PrimarySwitchPreference mBatterySaverPref;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
|
final Context mContext = spy(RuntimeEnvironment.application);
|
||||||
|
|
||||||
mContext = RuntimeEnvironment.application;
|
mBatterySaverPref = new PrimarySwitchPreference(mContext);
|
||||||
mBatterySaverController = spy(new BatterySaverController(mContext));
|
final LayoutInflater inflater = LayoutInflater.from(mContext);
|
||||||
ReflectionHelpers.setField(mBatterySaverController, "mPowerManager", mPowerManager);
|
final PreferenceViewHolder mHolder =
|
||||||
ReflectionHelpers.setField(mBatterySaverController, "mBatterySaverPref", mBatterySaverPref);
|
PreferenceViewHolder.createInstanceForTests(inflater.inflate(
|
||||||
|
com.android.settingslib.R.layout.preference_two_target, null));
|
||||||
|
final LinearLayout mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
|
||||||
|
inflater.inflate(R.layout.restricted_preference_widget_primary_switch, mWidgetView, true);
|
||||||
|
mBatterySaverPref.onBindViewHolder(mHolder);
|
||||||
|
|
||||||
Settings.Global.putInt(mContext.getContentResolver(),
|
doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE);
|
||||||
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
|
|
||||||
|
mBatterySaverController = new BatterySaverController(mContext);
|
||||||
|
mBatterySaverController.mBatterySaverPref = mBatterySaverPref;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onPreferenceChange_onStart() {
|
public void onBatteryChanged_true_switchEnabled() {
|
||||||
mBatterySaverController.onStart();
|
mBatterySaverController.onBatteryChanged(true);
|
||||||
verify(mBatterySaverPref).setSummary("Off");
|
|
||||||
|
assertThat(mBatterySaverPref.getSwitch().isEnabled()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onPreferenceChange_onPowerSaveModeChanged() {
|
public void onBatteryChanged_false_switchDisabled() {
|
||||||
mBatterySaverController.onPowerSaveModeChanged();
|
mBatterySaverController.onBatteryChanged(false);
|
||||||
verify(mBatterySaverPref).setSummary("Off");
|
|
||||||
|
assertThat(mBatterySaverPref.getSwitch().isEnabled()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getSummary_batterySaverOn_showSummaryOn() {
|
public void onPowerSaveModeChanged_differentState_updateToIsChecked() {
|
||||||
when(mPowerManager.isPowerSaveMode()).thenReturn(true);
|
when(mPowerManager.isPowerSaveMode()).thenReturn(true);
|
||||||
|
|
||||||
assertThat(mBatterySaverController.getSummary()).isEqualTo("On");
|
assertThat(mBatterySaverPref.isChecked()).isFalse();
|
||||||
|
|
||||||
|
mBatterySaverController.onPowerSaveModeChanged();
|
||||||
|
|
||||||
|
assertThat(mBatterySaverPref.isChecked()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getSummary_batterySaverOffButScheduled_showSummaryScheduled() {
|
public void onPowerSaveModeChanged_differentState_updateToUnChecked() {
|
||||||
when(mPowerManager.isPowerSaveMode()).thenReturn(false);
|
mBatterySaverPref.setChecked(true);
|
||||||
Settings.Global.putInt(mContext.getContentResolver(),
|
|
||||||
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 15);
|
|
||||||
|
|
||||||
assertThat(mBatterySaverController.getSummary()).isEqualTo("Will turn on at 15%");
|
when(mPowerManager.isPowerSaveMode()).thenReturn(false);
|
||||||
|
assertThat(mBatterySaverPref.isChecked()).isTrue();
|
||||||
|
|
||||||
|
mBatterySaverController.onPowerSaveModeChanged();
|
||||||
|
|
||||||
|
assertThat(mBatterySaverPref.isChecked()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getSummary_batterySaverOff_showSummaryOff() {
|
public void onPowerSaveModeChanged_sameState_noUpdate() {
|
||||||
|
when(mPowerManager.isPowerSaveMode()).thenReturn(false);
|
||||||
|
assertThat(mBatterySaverPref.isChecked()).isFalse();
|
||||||
|
|
||||||
|
mBatterySaverController.onPowerSaveModeChanged();
|
||||||
|
|
||||||
|
assertThat(mBatterySaverPref.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void setChecked_on_setPowerSaveMode() {
|
||||||
|
mBatterySaverController.setChecked(true);
|
||||||
|
|
||||||
|
verify(mPowerManager).setPowerSaveModeEnabled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void setChecked_off_unsetPowerSaveMode() {
|
||||||
|
mBatterySaverController.setChecked(false);
|
||||||
|
|
||||||
|
verify(mPowerManager).setPowerSaveModeEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isChecked_on_powerSaveModeOn() {
|
||||||
|
when(mPowerManager.isPowerSaveMode()).thenReturn(true);
|
||||||
|
|
||||||
|
assertThat(mBatterySaverController.isChecked()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isChecked_off_powerSaveModeOff() {
|
||||||
when(mPowerManager.isPowerSaveMode()).thenReturn(false);
|
when(mPowerManager.isPowerSaveMode()).thenReturn(false);
|
||||||
|
|
||||||
assertThat(mBatterySaverController.getSummary()).isEqualTo("Off");
|
assertThat(mBatterySaverController.isChecked()).isFalse();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user