Commit Graph

2265 Commits

Author SHA1 Message Date
Sunny Shao
bee65b4109 Merge "Revert^2 "Nullability Annotations replacement"" into main 2024-01-10 08:35:06 +00:00
Sunny Shao
076ed573eb Revert^2 "Nullability Annotations replacement"
This reverts commit 19d1d3d15d.

Reason for revert: revert it because this is not the root cause.

bug: 316867690
Change-Id: I0f168dbb64044aa720202af7b1040afd4f028c9c
2024-01-10 07:34:01 +00:00
Xinyi Mao
d92f82b437 Merge "Update accessibility content description for battery usage chart view." into main 2024-01-09 04:00:23 +00:00
mxyyiyi
b20f910cd1 Update accessibility content description for battery usage chart view.
- Add battery level percentage description.

Bug: 317000579
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batteryusage.*"
Change-Id: I03c8a97c521997170cbd72b7e0fcc88f7eb97221
2024-01-08 18:30:01 +08:00
Zaiyue Xue
d6cc80362c Refactor code according to comments in ag/25767430.
Bug: 318308397
Test: presubmit
Change-Id: Idc42d340508d2c41173ca157aabc452b6b0f6036
2024-01-08 15:12:40 +08:00
Xinyi Mao
df262ad2d6 Merge "Reset the delay time to refresh the periodic job." into main 2024-01-03 09:28:08 +00:00
mxyyiyi
5ef828930d Reset the delay time to refresh the periodic job.
Bug: 315225261
Test: manual
Change-Id: I5a42a9d2ac11ff5f036eaa85e37682438fceeac2
2024-01-03 15:53:38 +08:00
Pajace Chen
484f82e776 [Shadow] Switch the button for defend battery tips
Align the button position of defender settings tips with new design

Bug: 299403437
Test: Manual Test
Flag: None
Change-Id: I897d7291bfc21da69b661893368ddf4d6af7b06b
2024-01-02 14:37:36 +00:00
Zaiyue Xue
3b300cbf9f Merge "Fix battery usage chart was unexpectedly cleared" into main 2024-01-02 08:38:38 +00:00
Pajace Chen
cccb5e5746 Revert "[Shadow] Switch the button for defend battery tips"
This reverts commit 882058de81.

Reason for revert: Need update the test case

Change-Id: I9bb35941541408f04fb414e2b119619749e28cbf
2024-01-02 05:21:25 +00:00
Zaiyue Xue
9c06e522bc Fix battery usage chart was unexpectedly cleared
Bug: 318308397
Fix: 318308397
Test: manual
Change-Id: Ia00c0680a563eaffb3609c1372336a6b9ed7fa17
2024-01-02 11:59:16 +08:00
Pajace Chen
882058de81 [Shadow] Switch the button for defend battery tips
Align the button position of defender settings tips with new design

Bug: 299403437
Test: Manual Test
Flag: None
Change-Id: Ieac9cd34ba2e14581040a87a1eb7382decbe1212
2023-12-31 11:54:11 +00:00
Sunny Shao
946f52b2a1 Merge "Revert "Nullability Annotations replacement"" into main 2023-12-29 03:18:24 +00:00
Sunny Shao
19d1d3d15d Revert "Nullability Annotations replacement"
This reverts commit cf0501e4d7.

Reason for revert: b/317462033, it seems a flaky but revert it first.

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
2023-12-29 02:28:24 +00:00
ykhung
e69d57cfd6 Refine the DynamicDenylistManager dump() data format
Dump of DynamicDenylistManager:
      	ManualDenylist:
      	DynamicDenylist:
      		com.android.managedprovisioning
      		com.android.chrome

Bug: 306329984
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.datasaver"
Change-Id: If5eb8919ee8dc222692b7435f9670d861253be12
2023-12-28 02:37:47 +00:00
mxyyiyi
06fa244255 Update action log metircs of app optimize mode.
Bug: 317329360
Test: manual
Change-Id: Id4cd610a5bcc7988ecbd4545f5ef77a5253aac33
2023-12-27 14:13:25 +08:00
ykhung
eff0d103c0 Add more log for DynamicDenylistManager
Bug: 306329984
Test: presubmit
Change-Id: I977e80f1a7fc502d1e505856cfa5c4bd80b538c8
2023-12-26 02:07:27 +08:00
sunnyshao
cf0501e4d7 Nullability Annotations replacement
-- Replace the android.annotation.Nullable / android.annotation.NonNull
   with androidx.annotation.Nullable / androidx.annotation.NonNull

Bug: 316867690
Test: build pass
Change-Id: I0c1da55dfb09ece855151c47e0492d6f46538621
2023-12-20 08:50:09 +08:00
Jun Lan
cd516c8d46 Fix work profile apps are in Uninstalled
Context: work profile apps needs to pass userId to packageManager to get the uid.
Fixed screenshot: https://screenshot.googleplex.com/AkXfMWvmREyQJvv

Bug: 315477872
Fix: 315477872
Test: manual
Change-Id: I96eb42ef6ce27f15415f0e1fc32060d69b3fab2d
2023-12-18 10:28:16 +00:00
sunnyshao
40d9abb773 Fix Java crash problem
- Returns the BaseSavedState.EMPTY_STATE to avoid the exception.

Fixes: 312585313
Test: manual test
Change-Id: If21ca5e914a5ee5aff3fbeeee9595bb77a8fc3d0
2023-12-14 17:21:25 +08:00
mxyyiyi
ed7ce44f65 Add record for anomaly detect request source and clean up unused function.
Bug: 315905559
Test: make RunSettingsGoogleRoboTests ROBOTEST_FILTER="com.google.android.settings.fuelgauge.*"
Change-Id: I21a13a7910b21b27aac58143bd41c77e87c71953
2023-12-12 15:56:54 +08:00
mxyyiyi
a919306d75 Provide foreground_service usage time in BatteryDiffEntry.
- Fetch foreground service info through new api from UidBatteryConsumer.
- Record fgs & bg usage time separately, combine them till ui display.

Bug: 315255868
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.*"
Change-Id: Ic19844db7908a6ae6522c7a72972f44f94dcfca4
2023-12-11 15:57:10 +08:00
ykhung
6891900af5 Protect failed setUidPolicy() and avoid storing invalid UIDs
Add protection for the setUidPolicy() failed case to avoid invalid UIDs
to crash the caller process, and avoid storing the invalid UIDs to
SharedPreferences if it is failed to setUidPolicy()

Bug: 306329984
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I5c14434708b82ba3c238c2338d47085c2ce244e0
2023-11-29 16:59:17 +08:00
ykhung
65260c7f5e Reset the dynamic set denylist after reboot the device
Reset the uids which are set into the POLICY_REJECT_METERED_BACKGROUND
from the dynamic configured mechanism, rather than set by users
manually, to avoid it still take effect after rebooting the device.

Bug: 306329984
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: Idc0c21350cad7e48e6a5c7190565d5364236c2cd
2023-11-24 13:59:20 +08:00
ykhung
7007b11228 Replace the isWorkProfile method from the SettingsLib
Replace the isWorkProfile() in the Settings with the common method
defined in the SettingsLib to avoid duplicate code

Bug: 306329984
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: Ic9b18e6b80c23f9d4fc200080224daa27cbf4a4d
2023-11-24 11:08:06 +08:00
ykhung
072ccdd06a Dump the DynamicDenylistManager stored data into bugreport
Bug: 306329984
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.datasaver"
Change-Id: If512f561b3b376ea56e0dc78c339bf254ff20060
2023-11-24 10:01:59 +08:00
Wesley Wang
24278e7a92 Update setDenylist() input structure
- Change the input type from list of String to Integer
 - Update test case

Bug: 306329984
Test: make SettingsRoboTests
Change-Id: I018ef49523810577b17375628e45c24270a3bdf4
2023-11-16 07:07:52 +00:00
Wesley Wang
2dec2b2785 Merge "Apply dynamic deny list into data usage state" into main 2023-11-15 12:53:25 +00:00
Wesley Wang
f0b67ef0f9 Apply dynamic deny list into data usage state
- Initiate and sync existing network policy when creating the instance
 - Imple a method to suggest list of packages to set as POLICY_REJECT
 - Reset/clear the policy settings once clear storage or reset
   preference

Bug: 306329984
Test: make SettingsRoboTests
Change-Id: I10ba28fee08c29bc2092820fbc8d8ac0e61d30e7
2023-11-15 18:25:19 +08:00
ykhung
16b79cfdfb Add protection for the ConcurrentModificationException
Fix: 310120803
Test: presubmit
Change-Id: I8526ed0c93570ba3e183b675b29bd9e9e1582f5a
2023-11-15 11:32:00 +08:00
Xinyi Mao
129919def7 Merge "Update Power Anomaly UI." into main 2023-11-13 05:19:48 +00:00
mxyyiyi
1817f066ec Update Power Anomaly UI.
For Settings tip & app anomaly banner:

- update app anomaly hint color in dark/light theme
[Banner card]
- update icons to GM3 style
- update text font and button text color
- update button style from outlined to filled.
[Chart view]
- update warning icon size
- update percentage label alignment

Screenshots:
- [Settings]
[light]	https://screenshot.googleplex.com/ERWkD7TmDsLaxdG
[dark]	https://screenshot.googleplex.com/6JKvL5vEQTZtJfd
- [App]
[light]
https://screenshot.googleplex.com/3YoncDhGTzUcAZA
https://screenshot.googleplex.com/3hbGmqoYWSy9H9U
[dark]
https://screenshot.googleplex.com/9XKs8tXmRKL2jJP
https://screenshot.googleplex.com/SU4LTJYWXvpd42r
- [RTL+L10N][Arabic]
[Settings] https://screenshot.googleplex.com/V9HJkPcsoBJmsW8
[Apps]
https://screenshot.googleplex.com/B49VKy2jaZYisWK
https://screenshot.googleplex.com/6VZQ2gESRes8RMH
- [Force RTL][EN]
[Settings] https://screenshot.googleplex.com/4V7coyLf5ueUcGv
[Apps]
https://screenshot.googleplex.com/9UaERwDmrpitqdq
https://screenshot.googleplex.com/3JDfcXi8pmz5Mew

Bug: 309569299
Test: manual
Change-Id: I8bee7f86d602112e0cbbd936b439330aaff7275c
2023-11-13 11:52:44 +08:00
Chaohui Wang
32d9280e97 Merge "Revert^2 "Migrate to CompoundButton.OnCheckedChangeListener"" into main 2023-11-08 09:05:22 +00:00
Xinyi Mao
7350779738 Merge "Add log of BatteryEvent and BatteryUsageSlot while dumpping." into main 2023-11-08 08:06:44 +00:00
mxyyiyi
56aa92f7c4 Add log of BatteryEvent and BatteryUsageSlot while dumpping.
Test: manual
Bug: 294945588
Change-Id: If3cb4a4014d20f0d0c6275f54d141c1bdb4ac962
2023-11-08 14:46:52 +08:00
Yiling Chuang
c57d1ef69a Merge "Provide the flexibility to add more tip detector" into main 2023-11-08 04:51:57 +00:00
Yi-Ling Chuang
ac8925518a Provide the flexibility to add more tip detector
Bug: 309054332
Test: robotests
Change-Id: I650141072b6de6c4dcdbbb853fb9997295d6e929
2023-11-08 10:39:59 +08:00
Chaohui Wang
08a1c9876e Revert^2 "Migrate to CompoundButton.OnCheckedChangeListener"
8979681a8d

Change-Id: I60edd3aabf49afbe4aa016af780baa68d928bddf
2023-11-07 14:17:15 +00:00
Sebastian Pickl
8979681a8d Revert "Migrate to CompoundButton.OnCheckedChangeListener"
Revert submission 25147565-onSwitchChanged-CompoundButton

Reason for revert: breaking builds 

Bug:309601476

Reverted changes: /q/submissionid:25147565-onSwitchChanged-CompoundButton

Change-Id: Ie746db87d9c642599593aa3d5e5baf6b7ba89c0e
2023-11-07 13:26:36 +00:00
Chaohui Wang
71d1f021af Migrate to CompoundButton.OnCheckedChangeListener
Switch and SwitchCompat are both CompoundButton.

Using CompoundButton in Java will helps migration in the future.

Bug: 306658427
Test: manual - check Settings pages
Change-Id: If2e08a9a9557ec66a3b31ef18cd2e15943098a59
2023-11-07 20:22:27 +08:00
ykhung
e5536bb101 Update the constant fields in the BatteryOptimizeUtils
Test: presubmit
Bug: 306329984
Change-Id: I64df1d6f632f913e2d3629f640c6c75437e19e13
2023-11-07 18:43:42 +08:00
Yi-Ling Chuang
9718ae0aa9 Add battery warning TipType
Bug: 309054332
Test: rebuild
Change-Id: Ib7f95eb14aac7ac6d6a0941ea40a9eb723fa9300
2023-11-06 15:43:57 +08:00
Jun Lan
cca804e1ed Format battery java code
After this CL, we can follow Guideline:go/hc-mainline-dev#format-code to keep java format consistent.

Test: manual
Bug: 304439460
Change-Id: I5bb77f81b0bd9be618e34942eaaee8296bc42796
2023-11-06 13:55:48 +08:00
Jun Lan
da70c86bda Merge "Replace HashMap with ArrayMap for better performance" into main 2023-11-06 05:31:07 +00:00
Jun Lan
b0f9489a09 Replace HashMap with ArrayMap for better performance
Reason: https://screenshot.googleplex.com/BdHiua8gU8aGUmR

Test: manual
Bug: 308913393
Fix: 308913393
Change-Id: Iea085006ffe6ca48fe547319b9f0f4d20aa78bda
2023-11-06 12:34:05 +08:00
mxyyiyi
ad23b53942 Update battery usage data clear mechanism while time change.
- Accept time updated in the last job schedule range:
  [ max (last-full-charge / last-even-hours) , next-even-hours ]

Bug: 308714066
Fix: 308714066
Test: manual
Change-Id: Id92fffddb7666d63fce66fee696a27d957c8b537
2023-11-03 15:25:17 +08:00
YK Hung
c7c82de77e Merge "Fix full-charge timestamp lost in battery chart graph." into main 2023-11-02 15:06:16 +00:00
mxyyiyi
feaf08a9ba Fix full-charge timestamp lost in battery chart graph.
Bug: 308917113
Fix: 308917113
Test: manual
Change-Id: Ie87c72a020a3b169a25df6422ea3b456b988c14d
2023-11-02 19:17:04 +08:00
Treehugger Robot
90a563b12a Merge "Add a skeleton for dynamic deny list class" into main 2023-11-02 09:54:28 +00:00
Wesley Wang
98f76259ff Add a skeleton for dynamic deny list class
- Create a class with default sharedpreference management

Bug: 306329984
Test: make SettingsRoboTests
Change-Id: I06cf7c5ea82a44a61b05b7bbcddb6040cc917ec5
2023-11-02 17:01:32 +08:00