PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be73398

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

Change-Id: I9d1052ebb2b997301659f8d34fbd5f335705d7ef
This commit is contained in:
Stanley Wang
2022-03-08 11:08:44 +00:00
committed by Automerger Merge Worker
parent e8c55967ec 5e4be73398
commit 41f55133b0
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/battery_saver_settings.xml
View File

@@ -23,6 +23,7 @@
<com.android.settingslib.widget.MainSwitchPreference <com.android.settingslib.widget.MainSwitchPreference
android:order="-100" android:order="-100"
android:key="battery_saver" android:key="battery_saver"
android:title="@string/battery_saver_master_switch_title"
settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController"/> settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController"/>
<Preference <Preference

2
src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
View File

@@ -95,7 +95,6 @@ public class BatterySaverButtonPreferenceController extends
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey()); mPreference = screen.findPreference(getPreferenceKey());
mPreference.setTitle(mContext.getString(R.string.battery_saver_master_switch_title));
mPreference.addOnSwitchChangeListener(this); mPreference.addOnSwitchChangeListener(this);
mPreference.updateStatus(isChecked()); mPreference.updateStatus(isChecked());
} }
@@ -113,7 +112,6 @@ public class BatterySaverButtonPreferenceController extends
@Override @Override
public boolean setChecked(boolean stateOn) { public boolean setChecked(boolean stateOn) {
// This screen already shows a warning, so we don't need another warning. // This screen already shows a warning, so we don't need another warning.
mPreference.updateStatus(isChecked());
return BatterySaverUtils.setPowerSaveMode(mContext, stateOn, return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,
false /* needFirstTimeWarning */); false /* needFirstTimeWarning */);
} }

4
tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
View File

@@ -75,7 +75,7 @@ public class BatterySaverButtonPreferenceControllerTest {
public void updateState_lowPowerOn_preferenceIsChecked() { public void updateState_lowPowerOn_preferenceIsChecked() {
when(mPowerManager.isPowerSaveMode()).thenReturn(true); when(mPowerManager.isPowerSaveMode()).thenReturn(true);
mController.onSwitchChanged(null, mPowerManager.isPowerSaveMode()); mPreference.updateStatus(mPowerManager.isPowerSaveMode());
assertThat(mPreference.isChecked()).isTrue(); assertThat(mPreference.isChecked()).isTrue();
} }
@@ -84,7 +84,7 @@ public class BatterySaverButtonPreferenceControllerTest {
public void testUpdateState_lowPowerOff_preferenceIsUnchecked() { public void testUpdateState_lowPowerOff_preferenceIsUnchecked() {
when(mPowerManager.isPowerSaveMode()).thenReturn(false); when(mPowerManager.isPowerSaveMode()).thenReturn(false);
mController.onSwitchChanged(null, mPowerManager.isPowerSaveMode()); mPreference.updateStatus(mPowerManager.isPowerSaveMode());
assertThat(mPreference.isChecked()).isFalse(); assertThat(mPreference.isChecked()).isFalse();
} }