From 7e999df6d9cb5dc9a815956c30d02cf21b2ac5ec Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Tue, 23 Jan 2018 16:51:02 -0800 Subject: [PATCH 1/2] Revamp the battery saver page 1. Make BatterySaverSettings extend from DashboardFragment 2. Add new layout 3. Add battery saver controller Future cl will add controllers for seekbar and button Bug: 72228477 Test: RunSettingsRoboTests Change-Id: I21fb62aef874c04eca2988271f2fd9d7aacb0c6c --- res/layout/battery_saver_settings_button.xml | 47 ++++ res/values/strings.xml | 22 +- res/xml/battery_saver_settings.xml | 32 ++- res/xml/power_usage_summary.xml | 2 +- res/xml/power_usage_summary_legacy.xml | 2 +- .../core/gateway/SettingsGateway.java | 2 +- .../conditional/BatterySaverCondition.java | 2 +- .../fuelgauge/BatterySaverSettings.java | 253 ------------------ .../AutoBatterySaverPreferenceController.java | 61 +++++ .../batterysaver/BatterySaverSettings.java | 101 +++++++ .../search/SearchIndexableResourcesImpl.java | 2 +- .../fuelgauge/BatterySaverSettingsTest.java | 74 ----- ...oBatterySaverPreferenceControllerTest.java | 87 ++++++ 13 files changed, 346 insertions(+), 341 deletions(-) create mode 100644 res/layout/battery_saver_settings_button.xml delete mode 100644 src/com/android/settings/fuelgauge/BatterySaverSettings.java create mode 100644 src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java create mode 100644 src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java delete mode 100644 tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java create mode 100644 tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java diff --git a/res/layout/battery_saver_settings_button.xml b/res/layout/battery_saver_settings_button.xml new file mode 100644 index 00000000000..015d4d88f86 --- /dev/null +++ b/res/layout/battery_saver_settings_button.xml @@ -0,0 +1,47 @@ + + + + + +