Create shell UI for smart battery saver
This CL creates the new screen WITHOUT any of the behaviors (changing the global settings/calling power manager apis) and hooks it up to the preference in BatterySaverSettings for navigation. The logic for the preference in BatterySaver Settings is also added so that it shows the correct summary when the schedule settings are modified. Additionally, a small tweak is made to the radio preference widget to make it possible to hide the appendix view. It didn't seem to do anything except get in the way and potentially ruin your day, much like its biological counterpart. Test: Overriding power mode via adb, robotests Bug: 111450127 Change-Id: Ic681aaf565ce1caf7d00d314e14ae6c4779fe8f6
This commit is contained in:
@@ -86,7 +86,7 @@ public class AutoBatterySeekBarPreferenceControllerTest {
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.isVisible()).isTrue();
|
||||
assertThat(mPreference.getTitle()).isEqualTo("At 20%");
|
||||
assertThat(mPreference.getTitle()).isEqualTo("20%");
|
||||
assertThat(mPreference.getProgress()).isEqualTo(TRIGGER_LEVEL / INTERVAL);
|
||||
}
|
||||
|
||||
|
@@ -0,0 +1,94 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package com.android.settings.fuelgauge.batterysaver;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.PowerManager;
|
||||
import android.provider.Settings;
|
||||
import android.provider.Settings.Global;
|
||||
import androidx.preference.Preference;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(shadows = SettingsShadowResources.class)
|
||||
public class BatterySaverSchedulePreferenceControllerTest {
|
||||
|
||||
private static final int TRIGGER_LEVEL = 20;
|
||||
private static final int DEFAULT_LEVEL = 15;
|
||||
|
||||
private BatterySaverSchedulePreferenceController mController;
|
||||
private Context mContext;
|
||||
private Preference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
SettingsShadowResources.overrideResource(
|
||||
com.android.internal.R.integer.config_lowBatteryWarningLevel, DEFAULT_LEVEL);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mController = new BatterySaverSchedulePreferenceController(mContext);
|
||||
mPreference = new Preference(mContext);
|
||||
mController.mBatterySaverSchedulePreference = mPreference;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPreference_lowPowerLevelZero_percentageMode_summaryNoSchedule() {
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Global.AUTOMATIC_POWER_SAVER_MODE, PowerManager.POWER_SAVER_MODE_PERCENTAGE);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.getSummary()).isEqualTo("No schedule");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPreference_lowPowerLevelNonZero_percentageMode_summaryPercentage() {
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, TRIGGER_LEVEL);
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Global.AUTOMATIC_POWER_SAVER_MODE, PowerManager.POWER_SAVER_MODE_PERCENTAGE);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.getSummary()).isEqualTo("Will turn on at 20%");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPreference_percentageRoutine_summaryRoutine() {
|
||||
// It doesn't matter what this is set to for routine mode
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, TRIGGER_LEVEL);
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Global.AUTOMATIC_POWER_SAVER_MODE, PowerManager.POWER_SAVER_MODE_DYNAMIC);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.getSummary()).isEqualTo("Based on your routine");
|
||||
}
|
||||
}
|
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.Application;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.preference.PreferenceViewHolder;
|
||||
@@ -93,4 +94,13 @@ public class RadioButtonPreferenceTest {
|
||||
mPreference.onBindViewHolder(preferenceViewHolder);
|
||||
assertEquals(View.GONE, summaryContainer.getVisibility());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hideAppendix_shouldBeGone() {
|
||||
mPreference.setAppendixVisibility(View.GONE);
|
||||
View view = LayoutInflater.from(mContext).inflate(R.layout.preference_radio, null);
|
||||
PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(view);
|
||||
mPreference.onBindViewHolder(holder);
|
||||
assertThat(holder.findViewById(R.id.appendix).getVisibility()).isEqualTo(View.GONE);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user