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

Merge "Update Battery Settings main page (1/2)" into sc-dev

Browse Source
This commit is contained in:
Wesley Wang
2021-03-05 11:23:39 +00:00
committed by Android (Google) Code Review
parent 2aa8d2b437 280e3639cd
commit 783f1b1b56
3 changed files with 111 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
res/xml/power_usage_summary.xml
View File

@@ -17,6 +17,7 @@
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:key="power_usage_summary_screen" android:key="power_usage_summary_screen"
android:title="@string/power_usage_summary_title" android:title="@string/power_usage_summary_title"
settings:keywords="@string/keywords_battery"> settings:keywords="@string/keywords_battery">
@@ -31,6 +32,7 @@
android:fragment="com.android.settings.fuelgauge.PowerUsageAdvanced" android:fragment="com.android.settings.fuelgauge.PowerUsageAdvanced"
android:key="battery_usage_summary" android:key="battery_usage_summary"
android:title="@string/advanced_battery_preference_title" android:title="@string/advanced_battery_preference_title"
app:iconSpaceReserved="false"
settings:searchable="false" /> settings:searchable="false" />
<com.android.settings.widget.CardPreference <com.android.settings.widget.CardPreference
@@ -38,23 +40,27 @@
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" />
<com.android.settings.widget.PrimarySwitchPreference <PreferenceCategory>
android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings" <SwitchPreference
android:key="battery_saver_summary" android:key="battery_percentage"
android:title="@string/battery_saver" android:title="@string/battery_percentage"
settings:controller="com.android.settings.fuelgauge.BatterySaverController" /> android:summary="@string/battery_percentage_description"
settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />
</PreferenceCategory>
<SwitchPreference <PreferenceCategory>
android:key="battery_percentage" <Preference
android:title="@string/battery_percentage" android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
android:summary="@string/battery_percentage_description" android:key="battery_saver_summary"
settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" /> android:title="@string/battery_saver"
settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
<Preference <Preference
android:fragment="com.android.settings.fuelgauge.SmartBatterySettings" android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
android:key="smart_battery_manager" android:key="smart_battery_manager"
android:title="@string/smart_battery_manager_title" android:title="@string/smart_battery_manager_title"
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" /> settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" />
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference <com.android.settingslib.widget.FooterPreference
android:key="power_usage_footer" android:key="power_usage_footer"

78
src/com/android/settings/fuelgauge/BatterySaverController.java
View File

@@ -15,14 +15,21 @@
*/ */
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.annotation.VisibleForTesting; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.R;
import com.android.settings.widget.PrimarySwitchPreference; import com.android.settings.Utils;
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;
@@ -31,14 +38,19 @@ import com.android.settingslib.fuelgauge.BatterySaverUtils;
/** /**
* Controller to update the battery saver entry preference. * Controller to update the battery saver entry preference.
*/ */
public class BatterySaverController extends TogglePreferenceController public class BatterySaverController extends BasePreferenceController
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 private final ContentObserver mObserver = new ContentObserver(
PrimarySwitchPreference mBatterySaverPref; new Handler(Looper.getMainLooper())) {
@Override
public void onChange(boolean selfChange) {
updateSummary();
}
};
public BatterySaverController(Context context) { public BatterySaverController(Context context) {
super(context, KEY_BATTERY_SAVER); super(context, KEY_BATTERY_SAVER);
@@ -67,38 +79,54 @@ public class BatterySaverController extends TogglePreferenceController
@Override @Override
public void onStart() { public void onStart() {
mContext.getContentResolver().registerContentObserver(
Settings.Global.getUriFor(Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL),
true /* notifyForDescendants */, 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 @Override
public void onPowerSaveModeChanged() { public CharSequence getSummary() {
final boolean isChecked = isChecked(); final boolean isPowerSaveOn = mPowerManager.isPowerSaveMode();
if (mBatterySaverPref != null && mBatterySaverPref.isChecked() != isChecked) { if (isPowerSaveOn) {
mBatterySaverPref.setChecked(isChecked); return mContext.getString(R.string.battery_saver_on_summary);
} }
final ContentResolver resolver = mContext.getContentResolver();
final int mode = Settings.Global.getInt(resolver,
Global.AUTOMATIC_POWER_SAVE_MODE, PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
if (mode == PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE) {
final int percent = Settings.Global.getInt(resolver,
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
return percent != 0 ?
mContext.getString(R.string.battery_saver_off_scheduled_summary,
Utils.formatPercentage(percent)) :
mContext.getString(R.string.battery_saver_off_summary);
} else {
return mContext.getString(R.string.battery_saver_auto_routine);
}
}
private void updateSummary() {
if (mBatterySaverPref != null) {
mBatterySaverPref.setSummary(getSummary());
}
}
@Override
public void onPowerSaveModeChanged() {
updateSummary();
} }
@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 */);
} }
} }

103
tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
View File

@@ -17,20 +17,15 @@ 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.view.LayoutInflater; import android.provider.Settings;
import android.widget.LinearLayout;
import androidx.preference.PreferenceViewHolder; import androidx.preference.Preference;
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;
@@ -39,108 +34,84 @@ 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 PrimarySwitchPreference mBatterySaverPref; private Context mContext;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
final Context mContext = spy(RuntimeEnvironment.application);
mBatterySaverPref = new PrimarySwitchPreference(mContext); mContext = RuntimeEnvironment.application;
final LayoutInflater inflater = LayoutInflater.from(mContext); mBatterySaverController = spy(new BatterySaverController(mContext));
final PreferenceViewHolder mHolder = ReflectionHelpers.setField(mBatterySaverController, "mPowerManager", mPowerManager);
PreferenceViewHolder.createInstanceForTests(inflater.inflate( ReflectionHelpers.setField(mBatterySaverController, "mBatterySaverPref", mBatterySaverPref);
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);
doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE); Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
mBatterySaverController = new BatterySaverController(mContext);
mBatterySaverController.mBatterySaverPref = mBatterySaverPref;
} }
@Test @Test
public void onBatteryChanged_true_switchEnabled() { public void onPreferenceChange_onStart() {
mBatterySaverController.onBatteryChanged(true); mBatterySaverController.onStart();
verify(mBatterySaverPref).setSummary("Off");
assertThat(mBatterySaverPref.getSwitch().isEnabled()).isFalse();
} }
@Test @Test
public void onBatteryChanged_false_switchDisabled() { public void onPreferenceChange_onPowerSaveModeChanged() {
mBatterySaverController.onBatteryChanged(false); mBatterySaverController.onPowerSaveModeChanged();
verify(mBatterySaverPref).setSummary("Off");
assertThat(mBatterySaverPref.getSwitch().isEnabled()).isTrue();
} }
@Test @Test
public void onPowerSaveModeChanged_differentState_updateToIsChecked() { public void getSummary_batterySaverOn_showSummaryOn() {
when(mPowerManager.isPowerSaveMode()).thenReturn(true); when(mPowerManager.isPowerSaveMode()).thenReturn(true);
assertThat(mBatterySaverPref.isChecked()).isFalse(); assertThat(mBatterySaverController.getSummary()).isEqualTo("On");
mBatterySaverController.onPowerSaveModeChanged();
assertThat(mBatterySaverPref.isChecked()).isTrue();
} }
@Test @Test
public void onPowerSaveModeChanged_differentState_updateToUnChecked() { public void getSummary_batterySaverOffButScheduled_showSummaryScheduled() {
mBatterySaverPref.setChecked(true);
when(mPowerManager.isPowerSaveMode()).thenReturn(false); when(mPowerManager.isPowerSaveMode()).thenReturn(false);
assertThat(mBatterySaverPref.isChecked()).isTrue(); Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 15);
mBatterySaverController.onPowerSaveModeChanged(); assertThat(mBatterySaverController.getSummary()).isEqualTo("Will turn on at 15%");
assertThat(mBatterySaverPref.isChecked()).isFalse();
} }
@Test @Test
public void onPowerSaveModeChanged_sameState_noUpdate() { public void getSummary_batterySaverOffButScheduledZeroPercent_showSummaryOff() {
when(mPowerManager.isPowerSaveMode()).thenReturn(false); when(mPowerManager.isPowerSaveMode()).thenReturn(false);
assertThat(mBatterySaverPref.isChecked()).isFalse(); Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
mBatterySaverController.onPowerSaveModeChanged(); assertThat(mBatterySaverController.getSummary()).isEqualTo("Off");
assertThat(mBatterySaverPref.isChecked()).isFalse();
} }
@Test @Test
public void setChecked_on_setPowerSaveMode() { public void getSummary_batterySaverOffButScheduledBasedOnRoutine_showSummaryBasedOnRoutine() {
mBatterySaverController.setChecked(true); when(mPowerManager.isPowerSaveMode()).thenReturn(false);
Settings.Global.putInt(
mContext.getContentResolver(),
Settings.Global.AUTOMATIC_POWER_SAVE_MODE,
PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC);
verify(mPowerManager).setPowerSaveModeEnabled(true); assertThat(mBatterySaverController.getSummary()).isEqualTo("Based on your routine");
} }
@Test @Test
public void setChecked_off_unsetPowerSaveMode() { public void getSummary_batterySaverOff_showSummaryOff() {
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.isChecked()).isFalse(); assertThat(mBatterySaverController.getSummary()).isEqualTo("Off");
} }
} }