From ffcce1e7cf0996a58933c02c6ca16a4d0a14fa93 Mon Sep 17 00:00:00 2001 From: Wesley Wang Date: Tue, 6 Feb 2024 10:16:35 +0000 Subject: [PATCH] Add AOSP smart battery entries - Revert "Cleanup smart battery entries (1/3)" patch only instead whole topic, updated part of codes to resolve the conflicts This reverts commit 742e506d13e4f28e4334d1344816f1df45c0c772. Reason for revert: b/315401539 Bug: 315401539 Change-Id: I75a4e4f75b624c90aae18288c77214c0238e43eb --- res/values/config.xml | 2 +- res/xml/power_usage_summary.xml | 9 +- .../fuelgauge/PowerUsageFeatureProvider.java | 6 + .../PowerUsageFeatureProviderImpl.java | 10 ++ .../BatteryManagerPreferenceController.java | 85 ++++++++++++ .../PowerUsageFeatureProviderImplTest.java | 5 + ...atteryManagerPreferenceControllerTest.java | 129 ++++++++++++++++++ 7 files changed, 244 insertions(+), 2 deletions(-) create mode 100644 src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java diff --git a/res/values/config.xml b/res/values/config.xml index 433620d3551..9d7167101d7 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -709,7 +709,7 @@ true - true + false true diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml index e62f5c0c4b0..1af8a8c2410 100644 --- a/res/xml/power_usage_summary.xml +++ b/res/xml/power_usage_summary.xml @@ -1,5 +1,5 @@ -