Commit Graph

2475 Commits

Author SHA1 Message Date
Xin Li
5bfde9fbf5 Merge 25Q1 (ab/12770256) to aosp-main-future
Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3
2025-02-26 11:59:26 -08:00
Treehugger Robot
30d4456166 Merge "[owners] Remove clairewang@google.com from src/com/android/settings/fuelgauge/protos/OWNERS" into main 2025-02-25 13:02:39 -08:00
Henrik Baard
37bf0fbe57 Change range of battery saver schedule seekbar
The minimum value which can be set as trigger for
Battery saver was changed from 10% -> 20% however the
settings UI was not aligned with this change.

ref: b0fe225 Update the battery saver scheduler minimum level

Update the UI to align with the minimum trigger
level.

Bug: 396444535
Test: manual, check minimum seekbar value after reboot.
Test: atest BatterySaverScheduleSeekBarControllerTest
Change-Id: I4baa766ff1cb78ce656ae340ce930094b9e124e0
2025-02-20 09:13:39 +01:00
YK Hung
7ea9d15853 Fix the NPE in the tryToFetchUsageData() method
Test: atest
Bug: 371490669
Fix: 371490669
Flag: EXEMPT for simple fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:291e92d6493b9640bc87bc787b58daa0936bae8e)
Merged-In: I4167becf373a6279135261bbaff44ef0888728fa
Change-Id: I4167becf373a6279135261bbaff44ef0888728fa
2024-12-18 13:35:29 -08:00
Marcelo Arteiro
bedda9d1f2 Merge "Migrate materialColor* attributes into colors" into main 2024-12-09 08:36:04 +00:00
Marcelo Arteiro
8577c10535 Migrate materialColor* attributes into colors
The new color were already introduces in a previous CL ag/30322786

This CL is about replacing the attribute usage by the new color resources, which should work the same but cannot be overwritten, or styled, guaranteeing consistency across the OS.

The old attributes will be removed in CL: ag/29910036

Bug: 374273611
Test: presubmit
Flag: EXEMPT Un-flaggable refactor of private color resources
Change-Id: I05b5261054bcb6de40e4e40d633025495f3dd01f
2024-12-06 16:55:33 +00:00
Yiling Chuang
572afa59e6 Fix the unclickable learn more link.
The UsageProgressBarPreference is replaced with BatteryHeaderTextPreference, and the movement method of the textview was not added, which leads to the unclickable link.

Hence, add back the movement method of the textview to allow the linkable text.

Fixes: 382395040
Test: manual test
Flag: EXEMPT bugfix
Change-Id: I6dd5b2c2fbec891035fa8b0fefa47de6962324b7
2024-12-06 13:09:45 +00:00
mxyyiyi
7ce71c7619 [ExpressiveBattery] Replace LayoutPreference with IntroPreference.
Use IntroPreference to show apps' icon and label in
(1) App info > App battery usage page
(2)App info > App battery usage > Allow background usage

Bug: 349652542
Test: visual
Flag: EXEMPT flag by System prop
Change-Id: I44f3369e48f073d98455fcab3ccd10ffecdb8d66
2024-12-04 17:38:42 +08:00
Jacky Wang
0f591ca220 [Catalyst] Use lifecycleScope for BatterySaverPreference
NO_IFTTT=Catalyst only

Bug: 377993674
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Test: manual
Change-Id: Ie66882cd74300ced4914cd2c67fe130f66530100
2024-12-03 07:36:01 +08:00
YK Hung
1830f3b2bf Merge "[ExpressiveBattery] Update BatteryHeaderTextPreference" into main 2024-11-29 10:50:17 +00:00
Fan Wu
4084b5603e Merge "Update BatteryHeaderPreference with storage and read permit" into main 2024-11-29 06:15:32 +00:00
mxyyiyi
1cf9ab21b8 [ExpressiveBattery] Update BatteryHeaderTextPreference
- Remove background container
- Update the distance between status text and progress bar from 16dp to 10dp.

Bug: 349652542
Test: visual
Flag: EXEMPT flag by System prop
Change-Id: I1cd6f597e01daad9fbc5fb128926c8c153ff0328
2024-11-29 13:59:52 +08:00
Fan Wu
0dc50c4556 Update BatteryHeaderPreference with storage and read permit
Bug: 372774754

Test: atest and devtool test
NO_IFTTT=initial implementation

Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Change-Id: Idcf2241ccd52b2a8f19c1bb22577d7551ea1bc56
2024-11-29 04:03:51 +00:00
Jacky Wang
8a97245b3d [Catalyst] Add sensitivity level
NO_IFTTT=Catalyst only

Bug: 380457585
Flag: com.android.settings.flags.catalyst
Test: Manual
Change-Id: Ia98a925011723738e1a16cc0e0c3d703d3dbd505
2024-11-29 07:36:13 +08:00
Zaiyue Xue
8e6066f5d6 [PixelCare] Catalyst migration for battery header
NO_IFTTT=initialization

Bug: 372774754
Test: manual
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Change-Id: Icc1c46069147830b3360a467ffc2e666dadd3ddd
2024-11-26 14:38:16 +08:00
Zaiyue Xue
47d8e1daee Remove BatteryHeaderPreferenceController usage in PowerUsageSummary.
This is a no-op refactor. This change makes the BatteryHeaderPreference Catalyst migration doesn't depend on PowerUsageSummary.

Bug: 372774754
Test: manual
Flag: EXEMPT bug fix
Change-Id: I3d8d2856036f6840a0a163c35668f55baee487ab
2024-11-26 14:36:16 +08:00
Zaiyue Xue
178eb0bd15 Split battery header text to a separated preference
This is a no-op refactor. This change makes the Catalyst migration of battery level bar easy.

Bug: 372774754
Test: manual
Flag: EXEMPT bug fix
Change-Id: I6e64e6d9b34aeca584f4d4e951c58c3e1b361f9d
2024-11-26 13:09:12 +08:00
Zaiyue Xue
457029b355 Branch the following two files to make the next cl easy to review.
BatteryHeaderPreferenceController -> BatteryHeaderTextPreferenceController
BatteryHeaderPreferenceControllerTest -> BatteryHeaderTextPreferenceControllerTest

Bug: 372774754
Test: manual
Flag: EXEMPT bug fix
Change-Id: Ifed34f26b8229598050e9ef0da506ec656a78404
2024-11-25 12:44:10 +08:00
Jacky Wang
83708d4499 [Catalyst] Update PreferenceLifecycleContext.notifyPreferenceChange
Change the signature from metadata to preference key, so that the API
could be used to notify other preferences on the same screen.

NO_IFTTT=Catalyst only

Bug: 332201912
Flag: com.android.settings.flags.catalyst
Test: atest
Change-Id: Ibdf5f9004471d5491a0be1e84365cbe9f136c373
2024-11-19 13:38:06 +08:00
Xinyi Mao
9a18d2f170 Merge "Remove nested PreferenceCategory in Battery Usage page." into main 2024-11-18 04:56:11 +00:00
mxyyiyi
4c5f8481bd Remove nested PreferenceCategory in Battery Usage page.
https://screenshot.googleplex.com/83LwysPKMCRoRoG

Bug: 349652542
Test: atest BatteryUsageBreakdownControllerTest
Flag: EXEMPT for simple fix
Change-Id: If97b5e3de9757b814ad72aa47f6491d29106b8a3
2024-11-18 11:09:11 +08:00
Jacky Wang
e635f1e0ed [Catalyst] Support Getter API for settings service
NO_IFTTT=Catalyst only

Bug: 373895596
Flag: com.android.settings.flags.catalyst_service
Test: devtool
Change-Id: I367f350d2192d1285bf355a9e45c2d9bec11fa44
2024-11-16 08:06:28 +08:00
Treehugger Robot
93e24594c5 Merge "[Catalyst] Allow external SET for Use Battery Saver" into main 2024-11-14 18:05:29 +00:00
Sunny Shao
64c83d498f [Catalyst] Allow external SET for Use Battery Saver
NO_IFTTT=Catalyst only

Test: devtool
Bug: 377993674
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Change-Id: I8f1aa27150ca9a6d581d3132b4dbd51bce78ee68
2024-11-14 16:16:52 +08:00
Fan Wu
a794e01d45 Revert "Revert "Migrate Battery percentage preference into catal..."
Revert submission 30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI

Reason for revert: the failures is part of the robolectric issue b/378822459. Tested locally that the change is not breaking ClockworkSetupWizardRoboTests.

Reverted changes: /q/submissionid:30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI

Change-Id: I2210002924650cb54c55a41be25d97a3997c065e
2024-11-14 01:59:16 +00:00
ELIYAZ MOMIN (xWF)
1bbe798c8f Revert "Migrate Battery percentage preference into catalyst. Ref..."
Revert submission 30294757-catalyst_battery_percentage

Reason for revert: <Potential culprit for b/378858348  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Reverted changes: /q/submissionid:30294757-catalyst_battery_percentage

Change-Id: I17a124619a1d6c7b6930a1c26c2b84c1a52ce8f7
2024-11-13 13:39:43 +00:00
Fan Wu
c2f72f3cea Migrate Battery percentage preference into catalyst. Refactor logic from BatteryPercentagePreferenceController to BatteryPercentageSwitchPreference
Bug: 372774754
Test: atest and manual test
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
NO_IFTTT=already updated.

Change-Id: I9a259b966a832293e067c9f06c4c98479cb538a2
2024-11-13 01:28:02 +00:00
Sunny Shao
a84dd63548 Introduce overlaid BatterySaverGoogleScreen
Test: atest BatterySaverScreenTest
Bug: 368359126
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Change-Id: Iac80ea417564fd3c6a1859269109a77e08b0815f
2024-11-11 16:13:00 +08:00
Sunny Shao
23367e380a Migrate Use Battery Saver
Test: atest BatterySaverScreenTest BatterySaverMainSwitchPreferenceTest
Bug: 377993674
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Change-Id: I0c788688ed07ddcb5b2c97b2856194fd57c318e0
2024-11-11 10:24:38 +08:00
Owner Cleanup Bot
d4d8afa861 [owners] Remove clairewang@google.com from src/com/android/settings/fuelgauge/protos/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote the lowest CR value
(i.e. reject the CL) and the bot will abandon it. Vote the highest CR to
approve this change. You may also abandon this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/clairewang@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Ic721ef22503796ffa60b3aee904e6d219fbb674f
2024-10-25 17:23:00 +00:00
Zaiyue Xue
bdaadc471b Reafactor DataProcessManager Callback Function Logic
Keep the current thread for period job flow; only call handler back to
the main thread in UI flow.

Bug: 374570240
Fix: 374570240
Test: manual
Flag: EXEMPT bug fix
Change-Id: Ie923dbbd858c0c7000fa16a6c639f56624b2ece5
2024-10-23 13:33:17 +08:00
YK Hung
e72b2d2be1 Remove unsued legacy clearMemory() method
Test: atest
Bug: 373544647
Flag: EXEMPT for simple fix
Change-Id: I0efff624a0d05ec3b6b1ff34ba15db7a2abac031
2024-10-22 06:28:47 +00:00
mxyyiyi
1732fa8db0 Redesign the update logic of Allow Background Usage Page.
- Use one Controller to manage preferences related to battery Optimization Mode.
- Move optimization mode & preferences status update logic from Fragment to Controller.

Bug: 373544647
Test: atest AdvancedPowerUsageDetailTest  PowerBackgroundUsageDetailTest BatteryOptimizationModePreferenceControllerTest BackgroundUsageAllowabilityPreferenceControllerTest
Flag: EXEMPT for simple fix
Change-Id: I2b1fed837fb4904e4118ab51c1d0cda36c0f6198
2024-10-21 16:51:14 +08:00
Jacky Wang
f788c33aa4 Merge "Add Battery skeleton page and corresponding TS flag" into main 2024-10-18 07:59:41 +00:00
Jason Chiu
8797e3b8ea Merge "Move the annotation right before String" into main 2024-10-18 01:41:04 +00:00
Fan Wu
136244ab2a Add Battery skeleton page and corresponding TS flag
Test: atest
Bug: 372774754
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Change-Id: I2ce7581d0f7fdce3516fef415efdf562c63e38d4
2024-10-17 10:06:48 +00:00
Jason Chiu
ae5f82d36b Move the annotation right before String
Fix: 374015480
Test: build
Flag: EXEMPT N/A
Change-Id: Id4eb78319b10f63a0a8959643b63ed9a598f24af
2024-10-17 15:02:58 +08:00
Xinyi Mao
efb5fa5003 Merge "Use BatteryOptimizeUtils to add packageName into PowerSaveWhitelistUserApps allowlist, which will set app into Unrestricted Mode" into main 2024-10-17 04:59:43 +00:00
Treehugger Robot
ff94f6026b Merge "Remove unneeded cast to SettingsActivity" into main 2024-10-16 09:02:46 +00:00
Fan Wu
d93efafd95 Remove unneeded cast to SettingsActivity
This is a prerequisite for using upcoming Catalyst integration test

Bug: 372774754
Test: atest
Flag: EXEMPT minor update
Change-Id: I4809df8d06f0c3d2de1c10d17e997ff80a8d4086
2024-10-16 08:02:03 +00:00
Xinyi Mao
700f7e9ab2 Merge "Take as Unrestricted Mode in the UI if current Mode is Unknown." into main 2024-10-16 05:58:28 +00:00
mxyyiyi
1b83703adc Use BatteryOptimizeUtils to add packageName into PowerSaveWhitelistUserApps allowlist, which will set app into Unrestricted Mode
Bug: 372831500
Test: test manually by app "Baidu Cloud"> auto-backup settings > add into battery allowlist.
Flag: EXEMPT for simple fix
Change-Id: I225ff0a04db3b5863ab32920511f42fbc02440dc
2024-10-16 13:39:51 +08:00
mxyyiyi
7bfa060c5f Take as Unrestricted Mode in the UI if current Mode is Unknown.
- Battery usage mode MODE_UNKNOWN is (1) apps in allowlist and (2) app's OP_RUN_ANY_IN_BACKGROUND = MODE_IGNORED.
For this case, mode should be displayed as Unrestricted on UI since it is in allowlist; and should be logged as unknown mode for the potential compatibility issues.

- After Backup & Restore, the MODE_UNKNOWN will be reset to Optimized(Default) Mode on target device.

Bug: 372831500
Test: manual
Test: atest BatteryOptimizeUtilsTest
Test: atest AppOptModeSharedPreferencesUtilsTest
Flag: EXEMPT for simple fix
Change-Id: Ic18e026f71a4a50ffa1711e2ca0782aeb8b33076
2024-10-15 15:53:29 +08:00
Yiling Chuang
fd699a753f Merge "Migrate Battery Saver" into main 2024-10-15 03:05:18 +00:00
Sunny Shao
01ad71bc89 Migrate Battery Saver
Add the skeleton of the Battery Saver

Test: atest BatterySaverScreenTest
Bug: 368359126
Flag: com.android.settings.flags.catalyst_battery_saver_screen
Change-Id: I05a694c34468c01e4e032275567acbf37615c6f0
2024-10-14 17:34:10 +08:00
YK Hung
cbca375f20 Update the forEach() into for-loop
Test: atest
Bug: na
Flag: EXEMPT for simple fix
Change-Id: I2cf116d4d9f0f6d36f624d89579a12b4a2e0aaf0
2024-10-13 09:59:29 +00:00
mxyyiyi
c3b20d3a31 Also clear the foreground service usage time for BatteryDiffEntry should hide background usage time.
- Usage time in background is the sum{bg + fgs} usage time

Bug: 371919020
Fix: 371919020
Test: atest DataProcessorTest
Flag: EXEMPT for simple fix
Change-Id: I058d8511eac7510e2df6d9ac1713824cd8dbf3ba
2024-10-09 13:31:18 +08:00
YK Hung
291e92d649 Fix the NPE in the tryToFetchUsageData() method
Test: atest
Bug: 371490669
Fix: 371490669
Flag: EXEMPT for simple fix
Change-Id: I4167becf373a6279135261bbaff44ef0888728fa
2024-10-07 23:46:43 +00:00
mxyyiyi
5a9c00e63e Add log for fetch data from BatteryStatsManager.
Bug: 362177550
Bug: 357978626
Test: manual
Flag: EXEMPT bug fix
Change-Id: Iec6e7ccb871cc34d5ab3d2c8d8414edef0118024
2024-08-30 14:13:22 +08:00
mxyyiyi
511b67e0b8 Get the application context and pass into to a background executor.
Bug: 360260798
Test: manual
Flag: EXEMPT bug fix
Change-Id: I77bf9a7be75257be7871714afaf1fba81787f8b1
2024-08-19 17:02:32 +08:00