Commit Graph

1873 Commits

Author SHA1 Message Date
Wesley Wang
7423f4390c Move setup optimization mode to main thread
- Due to unclear root cause of optimization mode being reset after
   reboot, update the setup logic from deferred background thread to
   main thread, to avoid any possible background task unexecuted case.

Bug: 241735485
Test: make SettingsRoboTests
Change-Id: I2de2181321712f89fadc04bf5000aea91a01485a
2022-12-13 11:12:00 +00:00
Zaiyue Xue
4ee99b0e05 Remove logging for count of shown / hidden apps in Battery Usage page.
Bug: 262187603
Fix: 262187603
Test: presubmit
Change-Id: Iff3bcb07f6df424c7498f128739743210d8e7951
2022-12-13 13:17:56 +08:00
Zaiyue Xue
1bf57958d2 Don't hide 1% battery usage apps but show percentage "-" instead.
Bug b/242252864 will be fixed at the same time.

screen_record: https://drive.google.com/open?id=1ycEuazqQZzNWGO8E2Fh3GdgyTEd2Z9s0&authuser=0&resourcekey=0-x9BJJE6932jIv9fFoecjeQ&usp=drive_link

Bug: 262187603
Bug: 242252864
Fix: 262187603
Fix: 242252864
Test: manual
Change-Id: Id1a8b5291d66a38fb86f168d3115ae566e6ec079
2022-12-12 14:40:56 +08:00
Zaiyue Xue
fa90a4b311 [Battery usage U] Create a flag to guard battery usage features
Bug: 261800937
Fix: 261800937
Test: manual
Change-Id: I891c235228c9ca0709471b496e6f75167fd0a126
2022-12-09 15:15:34 +08:00
Zaiyue Xue
691c39b862 Merge "[Battery usage U] Calculate each item pertage for App tab and System tab separately." 2022-12-09 02:40:33 +00:00
TreeHugger Robot
fe3250007b Merge "[Battery usage U] For system comsumed power, use device comsumed power directly instead of removing app comsumed power from it." 2022-12-09 02:32:55 +00:00
Zaiyue Xue
5474c1849b [Battery usage U] For system comsumed power, use device comsumed power directly instead of removing app comsumed power from it.
Bug: 261826748
Fix: 261826748
Test: manual
Change-Id: Iab6eed4339fabe342835a020cadae11e6256be20
2022-12-08 19:03:27 +08:00
Zaiyue Xue
131958c8bc [Battery usage U] Calculate each item pertage for App tab and System tab separately.
Bug: 261820602
Fix: 261820602
Test: manual
Change-Id: Iaab63bd5c6459486645987524d61b69dfca20fd6
2022-12-08 18:07:47 +08:00
TreeHugger Robot
2825910515 Merge "Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced." 2022-12-08 02:18:15 +00:00
Zaiyue Xue
4b14c49dfb Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced.
Bug: 256123455
Test: presubmit
Change-Id: Ia22eb8d11836b9b0d8ab74f4760e81966040a947
2022-12-07 20:47:44 +08:00
Zaiyue Xue
76f19809c1 Fix b/261390301: NullPointerException at BatteryChartPreferenceController.addAllPreferences()
Bug: 261390301
Fix: 261390301
Test: manual
Change-Id: I23a2f0e73c5840b87577e734a4760423e0d62516
2022-12-07 17:09:05 +08:00
TreeHugger Robot
ccc77bf359 Merge "[Battery usage U] Show battery usage info immediately up till as close to the current moment as possible." 2022-12-06 14:56:29 +00:00
Zhenwei Chen
52323128dc Fix incorrect dock defender banner icon.
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-12-06 09:40:50 +00:00
Zaiyue Xue
3d7b8b3bfe [Battery usage U] Show battery usage info immediately up till as close to the current moment as possible.
screen_record: https://drive.google.com/file/d/1Wdm8Wpn39k6E9Yo4bbTENf5VANP337QA/view?usp=share_link&resourcekey=0-1LNmaTaZI13DUmjNfkBehQ

Bug: 252407178
Fix: 252407178
Test: maunal
Change-Id: Ia08dea791bb72113719fd1316e8e9587a96eaef1
2022-12-06 17:36:55 +08:00
Zaiyue Xue
00fb008e9c Support App and System tabs for battery usage breakdown.
design_doc: go/usage-frontend-dd

screen_record: https://drive.google.com/file/d/1I8dnoMf7y9KUg0eVeqLJpHqGGOtaX6_0/view?usp=share_link&resourcekey=0-Mte0-LKN1LULRssg9t7zGg

Bug b/260786962 is also fixed in this cl.

Bug: 258123381
Bug: 260786962
Fix: 258123381
Fix: 260786962
Test: manual
Change-Id: Ifd337331d02dc10c3234c594b2e142bcd459c00f
2022-12-06 11:23:27 +08:00
Kuan Wang
ec1c9d94f2 Remove foreground_service_usage_time_in_ms field which has been merged
into background_usage_time_in_ms in the BatteryUsageStats (b/257392992).

Test: make RunSettingsRoboTests + manual
Bug: 258124768
Bug: 253553141
Change-Id: I0967eec0cbe6d0cb7a0535d744a1046dec1d267b
2022-12-06 01:04:48 +00:00
Kuan Wang
1e8ca1d7d2 Move fuelgauge_usage_state.proto into fuelgauge folder.
Test: make RunSettingsRoboTests + manual
Bug: 20424125
Change-Id: Id0ed25e06258764ec58263c2e2f7dec7bfd81c0a
2022-12-02 15:00:58 +08:00
Kuan Wang
bc4548b29e Add BugReportContentProvider to support new battery usage architecture.
Test: make RunSettingsRoboTests + manually
Bug: 256123932
Change-Id: I8cc48f5c66e5cbd958bdd73ff8e7d6e555bd9c3b
2022-12-02 02:53:13 +00:00
Kuan Wang
362def5275 Fix the issue that no data is returned when there is no full charge data
in the database.

Test: make RunSettingsRoboTests + manual
Bug: 260938983
Bug: 253553141
Change-Id: Ie12f239ce83a6ac2cd95c1663cd82e2974a7eaf3
2022-12-01 14:39:03 +08:00
Chaohui Wang
8b49b96569 Merge "Fix R for BatteryInfo" 2022-11-30 06:01:55 +00:00
Chaohui Wang
4003c679f1 Fix R for BatteryInfo
Bug: 260441791
Test: Make Settings
Change-Id: I4d330b5724a85fdd41f4415199143b4e64589151
2022-11-30 11:43:52 +08:00
ykhung
e77b5bbecb Replace the getBatteryLevel() method from SettingsLib API
Bug: 260524172
Test: presubmit
Change-Id: Icb56abd3dc258dde142a956124dc12bbfd9ae889
2022-11-30 00:22:19 +08:00
Kuan Wang
20f6b1faaa Merge "Populate new fields foreground_service_usage_time_in_ms, foreground_usage_consume_power, foreground_service_usage_consume_power, background_usage_consume_power and cached_usage_consume_power into database and pass them to UI." 2022-11-29 06:52:08 +00:00
Kuan Wang
53a761f55b Populate new fields foreground_service_usage_time_in_ms,
foreground_usage_consume_power, foreground_service_usage_consume_power,
background_usage_consume_power and cached_usage_consume_power into
database and pass them to UI.

Test: make RunSettingsRoboTests + manual
Bug: 256123455
Bug: 258124768
Change-Id: Ic46032f67eff5898f9d4182c517bbebe478eca01
2022-11-29 11:42:26 +08:00
Zhenwei Chen
2ca0fb13a3 Merge "Add dock defender battery tips" 2022-11-29 02:53:27 +00:00
Zhenwei Chen
8d11d9ceea Add dock defender battery tips
1. Remove the dock defender v1 code
2. Add dock defender battery tips and update
   corresponding list item string

Bug:256523472
Test: Unit test passed and manual test on device
Change-Id: Ib6c09df056744142f42f5e2a13252b58e54c7534
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-11-28 17:45:51 +08:00
Kuan Wang
5285597dee Invoke the cursor.close() after loading data from database.
Test: make RunSettingsRoboTests + manual
Bug: 258099535
Change-Id: Ie8d8f5294fff6e44b7151e22f9ae7b5b53cd5d6d
2022-11-28 16:37:53 +08:00
Kuan Wang
2b93d40683 Use the field isFullChargeCycleStart in database to get the last full
charge cycle start and remove the unused SharedPreference.

Test: make RunSettingsRoboTests + manual
Bug: 253553141
Change-Id: I74ef71775fa5d4871077f6d5573467aa5843bc6b
2022-11-28 11:27:24 +08:00
Zhenwei Chen
41ce87729e Fix LoaderCallback.onLoadFinished uncalled issue
When two loaders started almost at the same time,
it is possible onLoadFinished is never called.

Bug: 256523472
Test: Unit tests passed and manual test on device
Change-Id: I41a041d5878f9930db44775408380d0d4588faba
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-11-25 16:01:04 +08:00
Kuan Wang
5e79362920 Merge "Clean up unused files for Battery Usage in SettingsGoogle, which have been moved into Settings." 2022-11-23 07:36:42 +00:00
Kuan Wang
24f0f2c2da Clean up unused files for Battery Usage in SettingsGoogle, which have
been moved into Settings.

Test: make RunSettingsRoboTests
Bug: 256123455
Change-Id: I21fe684b9b3a2a748c5d10353e68e15ddf281838
2022-11-23 02:22:24 +00:00
ykhung
5cfec67572 Add FUELGAUGE_BATTERY_SAVER_SCHEDULE for saver schedule page metric
Bug: 260074438
Test: make test RunSettingsRoboTests
Change-Id: Ib7e55b6638d1b10a47cbf25f5dbbb40b3f4962f2
2022-11-23 10:01:26 +08:00
Zhenwei Chen
a725bac68c Clean up useless defender dialog code
Test: Unit test passed
Bug: 256523123
Change-Id: If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-11-22 12:22:08 +08:00
Zaiyue Xue
bc1f4798a6 Refoactor 2 util functions from DatabaseUtil to BatteyUtils.
Bug: 252407178
Test: presubmit
Change-Id: I393777186cc308298f0a8b76af4672b9012ed681
2022-11-17 14:25:10 +08:00
Kuan Wang
1493fa2fea Database restructure: use protobuf to save battery information fields.
This patch only updates the existing fields.
There will be 2 following patches to:
1. Expose the new fields (foreground / foreground service / background x
   usage time / power consumption) to UI.
2. Get the full charge cycle start time from Database and remove the
   SharedPreference.

Test: make RunSettingsRoboTests + manual
Bug: 253553141
Change-Id: Iee02dc7e671f97899cb1495323acfa0173e31df2
2022-11-17 06:06:54 +00:00
TreeHugger Robot
be679b68a6 Merge "Clean up BatteryAppListPreferenceController" 2022-11-17 05:05:25 +00:00
Zaiyue Xue
7a30768503 Clean up BatteryAppListPreferenceController
Bug: 256123455
Bug: 258576047
Fix: 258576047
Test: presubmit
Change-Id: I8c3d05f76e7a6995fccc34b2cc60ee126bb3d350
2022-11-17 11:28:06 +08:00
ykhung
3cf14b682e Clean up the KEY_ROUTINE from the Settings
Fix: 258603978
Test: make RunSettingsRoboTests
Change-Id: I65033ca18953b57317af64418bb0b18d48eaacd8
2022-11-15 16:07:57 +08:00
ykhung
a2f5c5a24e Remove the 'schedule by routine' from the saver scheduler
Fix: 258603978
Test: make RunSettingsRoboTests
Change-Id: I6256957dc5a4be6699998c825fb32e03f638af39
2022-11-14 11:24:17 +08:00
ykhung
d66fd82c35 Verify and reset invalid battery setting in the data restore stage
Verify and reset invalid battery setting configuration in the data
restore stage to avoid resoring invalid configuration from other devices

Bug: 258243197
Test: make RunSettingsRoboTests
Change-Id: I1a0febd2ad527147e4e9e9c77734c4b51963263a
2022-11-14 01:51:46 +00:00
Zaiyue Xue
62a13f73a3 Merge "Update the preference controller in search index for battery usage." 2022-11-11 03:37:10 +00:00
Kuan Wang
6e23499e98 Remove the timestamps of last day for battery level chart if last day has less than 2 hours data. am: 57cb76428e am: 28bdf84b5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309948

Change-Id: I748c1247a96b3d4ae9160d76c768e2db7af2611a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 11:46:43 +00:00
YK Hung
2cdc7409b5 Merge "Verify and reset invalid scheduled battery level in the booting stage" 2022-11-10 10:23:04 +00:00
Kuan Wang
57cb76428e Remove the timestamps of last day for battery level chart if last day has less than 2 hours data.
Test: make RunSettingsRoboTests
Bug: 256525782
Change-Id: I3f735f8f3ec10b2952b93111f0243e44117ff58a
2022-11-10 08:56:39 +00:00
ykhung
4c0de2685a Verify and reset invalid scheduled battery level in the booting stage
The minimum scheduled battery level is changed from 5% to 10% in T, if
users upgrade the device from S to T with invalid level value in
the Settings.Global, we have to force reset it into the new minimum
battery level value.

Bug: 258243197
Test: make RunSettingsRoboTests
Change-Id: I89003120aaebcff78d4bf3f7ae8b54e97adae3c8
2022-11-10 16:38:18 +08:00
Zaiyue Xue
c9d85ff63d Update the preference controller in search index for battery usage.
BatteryAppListPreferenceController is totally replaced by
BatteryChartPreferenceController now. Update the search index returns.

Bug: 256123455
Test: manual
Change-Id: I2340f1be0cee74771aab293a5df8551325c014be
2022-11-10 13:53:35 +08:00
Kuan Wang
d81a6ceefd Remove unnecessary check canScheduleExactAlarms() as Settings always
has the permission.

Test: make RunSettingsRoboTests
Bug: 256123455
Change-Id: I5089494164581465da9533671fc414c7bee1196f
2022-11-09 01:25:10 +00:00
Wesley Wang
5664ebc351 Merge "Add BatteryHistoricalLogUtil class" 2022-11-07 03:08:17 +00:00
Wesley Wang
d90026d184 Add BatteryHistoricalLogUtil class
- Impl optimize mode log mechanism to record optimize setup flow
 - Log optimize action with MANUAL, APPLY, RESET and RESTORE
 - Use proto file to serialize logs
 sample result: https://screenshot.googleplex.com/5KPrHVGb4pMvS7V.png

Bug: 241735485
Test: make SettingsRoboTests
Change-Id: I879663de4cf45d0cfb9cd7eee957eeb65addfbe1
2022-11-04 18:09:11 +08:00
Yi-Ling Chuang
e3fcf1f082 Remove BatteryFixSlice as it's not used
The BatteryFixSlice hasn't been used for a while, and it's introducing
memory leaks due to a design change at the framework's end. Hence,
remove it.

Bug: 245385410
Test: robotests
Change-Id: I517cab71a32613d5cb5fcd3beb991a24926a2902
2022-11-04 12:22:56 +08:00