PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,995 Commits 1 Branch 0 Tags
f5b40bc2818fae72b51d3fb641db0f472f00d63f
Commit Graph

2090 Commits

Author SHA1 Message Date
TreeHugger Robot
89e5b837b9 Merge "Adjust background time to avoid background + screen time larger than time slot duration." 2023-01-11 05:54:55 +00:00
Kuan Wang
a396885f5e Adjust background time to avoid background + screen time larger than 
time slot duration.

Test: make RunSettingsRoboTests
Bug: 265089855
Fix: 265089855
Change-Id: Idf3fee13eccd5b1f699feb5f79bd2aa474e444b8
 2023-01-11 11:44:36 +08:00
Zaiyue Xue
4221504e43 [Battery usage U] [UI] Update the text in footer 
Bug: 265088249
Fix: 265088249
Test: manual
Change-Id: If112f7a0b3509cdf11f1ffcea233ab3ace2bf6d7
 2023-01-11 11:10:54 +08:00
Zaiyue Xue
f080429ddb Refactor processBatteryDiffData() from DataProcessor to BatteryDiffData class. 
So that only hourly battery diff data needs purgeFakeAndHiddenPackages()
and combineBatteryDiffEntry(). This is also easy to set hourly threshold
in the next cl.

Bug: 264840285
Test: manual
Change-Id: Ie0bc6d53f96285285019dd83c1f39305eca79c71
 2023-01-10 20:40:13 +08:00
Zaiyue Xue
7f3ff17bcf Refactor PowerUsageFeatureProvider: Cache the config set to avoid generating the set again. 
Bug: 262802531
Test: manual
Change-Id: I61b36e4e057c432d814aa104a37f0e0d552720cb
 2023-01-10 19:42:09 +08:00
Kuan Wang
a708592e0a Add logging for total screen-on time and foreground usage time. 
Test: manual
Bug: 260965322
Change-Id: Ia1711fb73a6390e6a91289331daf3d88675731fe
 2023-01-10 14:36:01 +08:00
TreeHugger Robot
1b4428ea3d Merge "[Battery usage U] [UI] Show screen time in the battery usage app list items" 2023-01-09 11:33:10 +00:00
TreeHugger Robot
95b9ca6573 Merge "Revert "Fix the inverted logic to judge whether an app is system app."" 2023-01-09 09:39:02 +00:00
Zaiyue Xue
48a1dacc39 [Battery usage U] [UI] Show screen time in the battery usage app list items 
https://drive.google.com/file/d/1N2yrra6cga6CRIXzxTGhctcxwN47lE89/view?resourcekey=0-qlw1a78Ph-gSfXFAHKoumQ
https://drive.google.com/file/d/1joSI3YL8dn0rRW1Ywyte7MUy_CTDFS2p/view?resourcekey=0-VsgaqSi2YUfn6ImZEOBH-g

Bug: 258120710
Test: manual
Change-Id: Id22d2490d0bffeb8b7d2e0941bcdb4e3d352e966
 2023-01-09 17:26:56 +08:00
Zaiyue Xue
9a35838436 Revert "Fix the inverted logic to judge whether an app is system app." 
This reverts commit 814eff1c24.

Reason for revert: The original logic is right.

Change-Id: I2aee0f9ab13c60d843e91056de9d409a1d84b9d4
 2023-01-09 07:30:35 +00:00
TreeHugger Robot
3eabebb730 Merge "Change all the system items unclickable in battery usage list." 2023-01-09 02:47:57 +00:00
TreeHugger Robot
d6905dd6ce Merge "[Battery usage U] [UI] Show total "Screen On Time" in the battery usage page" 2023-01-07 03:22:46 +00:00
Zaiyue Xue
e853dd3104 Change all the system items unclickable in battery usage list. 
Bug: 264643763
Fix: 264643763
Test: manual
Change-Id: I5854f9517bfb308142cc5f3c5e5cd8f54a237d59
 2023-01-06 19:42:46 +08:00
Zaiyue Xue
833e47d851 [Battery usage U] [UI] Show total "Screen On Time" in the battery usage page 
Screen record: https://drive.google.com/open?id=16ZOp1E2YBzWQXbnXl786FaLFPel-S9CF&authuser=0&resourcekey=0-oRqCrdTc9FZjVgsq9orhEw&usp=drive_link
For Arabic: https://drive.google.com/open?id=1zh_4jcUnqLC6CDgwju1qQkWJ0QCtm19c&authuser=0&resourcekey=0-kuKfDdOTWxqOUmD0RfPNLQ&usp=drive_link

Next step: show screen on time for each app

Bug: 258120710
Test: manual
Change-Id: I2085a2a85ebd50b2ac876972f6a8ebbf6f20246c
 2023-01-06 19:09:52 +08:00
Zaiyue Xue
814eff1c24 Fix the inverted logic to judge whether an app is system app. 
Bug: 264626206
Fix: 264626206
Test: maunal
Change-Id: I3750e3b11e444add27243c492cf8968373cd57d0
 2023-01-06 15:24:44 +08:00
Zaiyue Xue
7c987c9d98 [Battery usage U] Add an item "Others" in the app list to group small usage apps. This will make the total percetage 100%, which is easy to understand for users. 
Bug: 258124173
Fix: 258124173
Test: manual
Change-Id: I5965eeb73a2071c4a9994655e4ed24ec3adf64e8
 2023-01-05 11:22:33 +08:00
Zaiyue Xue
e756675e69 Combine system apps to one item in the battery usage app list. 
Bug: 262952385
Test: 262952385
Test: maunal
Change-Id: I078677b13a22f5e2f8f194bb5d5259f8c54c6b1e
 2023-01-04 20:32:56 +08:00
TreeHugger Robot
949dd58112 Merge "Replace battery usage breakdown list from tabs to dropdown list." 2023-01-04 12:17:41 +00:00
Zaiyue Xue
778a4b42e3 Replace battery usage breakdown list from tabs to dropdown list. 
screen records:
https://drive.google.com/file/d/15VJGQ_G2KIpyFcvZsyE0iRno0WZhfjGb/view?usp=sharing&resourcekey=0-bg48BsC2b-BT_80CGlzpWg
https://drive.google.com/file/d/1RaoysytQ5oZQu8CNPhYgxqBahk3UfVbr/view?usp=sharing&resourcekey=0-Xk2J36fjYWBo6KpFTrMr4Q

Bug: 264338267
Fix: 264338267
Test: manual
Change-Id: Ic020cce711b5232adfc80272836d7c2d0250d94a
 2023-01-04 16:20:47 +08:00
Kuan Wang
b2f8c095ac Add null check to avoid NullPointerException. 
Test: make RunSettingsRoboTests
Bug: 264198981
Fix: 264198981
Change-Id: Ida2ff6beed5c0dba6329023b72e55daf1bf573f1
 2023-01-04 07:08:37 +00:00
XingHai Lu
df1fc7e0fa Merge "Cleanup plurals format Change <one> to <1> in string res file Test: Update, existing tests still pass bug: 199230342" 2022-12-30 02:44:25 +00:00
ykhung
553baca4ce Remove EarlyWarningTip and move the logic into LowBatteryTip 
Fix: 263835342
Test: presubmit
Change-Id: I256cd6f364979046ee87524751c3fe137a0524c2
 2022-12-29 15:53:57 +08:00
YK Hung
ea0b1a99b0 Merge "Remove the legacy EarlyWarning tip mechanism to improve performance" 2022-12-28 16:03:14 +00:00
Kuan Wang
1ce97c8ebe Generate app and device screen-on time data and return back to UI for 
rendering.

Test: make RunSettingsRoboTests + manually
Bug: 260964903
Change-Id: I2fd69b4686cc2e1413ad0eb43c07b6164e411411
 2022-12-28 07:40:39 +00:00
ykhung
4a470d87dc Remove the legacy EarlyWarning tip mechanism to improve performance 
Fix: 263835342
Test: presubmit
Change-Id: I0c3f61a21874c70b49cdeb73bbdc285ef8c4a35f
 2022-12-28 15:33:19 +08:00
Kuan Wang
bb57a75f36 Merge "Dump app usage event data in db in BugReportContentProvider." 2022-12-28 03:08:40 +00:00
Kuan Wang
b2b74d8a8b Dump app usage event data in db in BugReportContentProvider. 
Test: make RunSettingsRoboTests
Bug: 260965327
Change-Id: I9f7ac74ed53b19d6ce9be3afa3ecf2a602d6309b
 2022-12-28 02:56:43 +00:00
Kuan Wang
120c68881c Generate intermediate app usage data after all usage data has been 
loaded for further use.

Test: make RunSettingsRoboTests + manually
Bug: 260964903
Change-Id: I52d96151cab112adca68573f3b47a53b7152f2c0
 2022-12-28 02:56:35 +00:00
ykhung
b875752307 Add isBatteryManagerSupported() to control adaptive preferences page 
Add isBatteryManagerSupported() in the PowerUsageFeatureProvider to
support controlling the adaptive preferences page dynamically

Bug: 229558366
Test: presubmit
Change-Id: Iffb552feb9e08ca72f2970eb778cd3fcd18f0b7e
 2022-12-27 15:31:11 +08:00
xinghailu
1637a3a10a Cleanup plurals format 
Change <one> to <1> in string res file
Test: Update, existing tests still pass
bug: 199230342

Change-Id: Ic3a5259570cb52cd1664638f3b1058c87a631c04
 2022-12-27 12:12:11 +08:00
TreeHugger Robot
fec083b2cd Merge "[Battery usage U] Remove 'Phone Idle' to avoid confusion" 2022-12-26 02:42:50 +00:00
Wesley Wang
934700b559 Refactor battery saver schedule method 
- Move schedule method and definition into BatterySaverUtils and reuse
   them from utils

Bug: 260302999
Test: make SettingsRoboTests
Change-Id: I402c57629d1a6f3317f0a7c14529508ce81f999c
 2022-12-22 11:45:09 +00:00
Zaiyue Xue
daeafc8fc6 [Battery usage U] Remove 'Phone Idle' to avoid confusion 
Bug: 252938706
Fix: 252938706
Test: manual
Change-Id: I0ad973718f77640839dbdf4ac5ca4241f01bdb79
 2022-12-22 08:36:59 +08:00
Kuan Wang
2c7f06e9b3 Use taskRootPackageName instead of packageName to load uid when usage 
resource is USAGE_SOURCE_TASK_ROOT_ACTIVITY and taskRootPackageName is
not empty.

This logic is consistent with digital wellbeing: assign the screen-on
time onto task root activity when usage resource is
USAGE_SOURCE_TASK_ROOT_ACTIVITY.

Bug: 260964679
Test: make RunSettingsRoboTests + manual
Change-Id: I4c7ed342d8c00951879f5826bf79575f330ce86e
 2022-12-21 02:39:23 +00:00
Kuan Wang
a1a7cba6a6 Move the getBatteryLevelData function from DataProcessor to 
DataProcessManager and start the async task in DataProcessManager when
there is no battery level data.

Test: make RunSettingsRoboTests + manually
Bug: 260964903
Change-Id: Ie36ab6d121a5596a3abc16e7f570dd0d9b32e11c
 2022-12-21 02:39:11 +00:00
Kuan Wang
1e7181cfcc Remove "Other Users" entry in app usage list. 
Don't show the aggregated other user entry in the app usage list to keep
consistent with screen-on time data.

Bug: 260964903
Test: make RunSettingsRoboTests
Change-Id: Id611e7222602f5ad2ea0fe27fb3f9f62fed31ff9
 2022-12-20 03:00:05 +00:00
Kuan Wang
97924455ff Implement the app usage data loading from database function. 
Bug: 260964903
Test: make RunSettingsRoboTests + manual
Change-Id: I459dbdebe53e6b7421642955f36976b3e7c95fcb
 2022-12-20 02:31:50 +00:00
Kuan Wang
8d2a26caed Add DataProcessManager to manage the async tasks of battery usage data 
processing.

Test: make RunSettingsRoboTests + manually
Bug: 260964903
Change-Id: Id3b2772a98ec2ab3b03910c8a5e81adf7ccd5646
 2022-12-19 03:40:48 +00:00
Kuan Wang
cf7e1141df Cancel data loading when hourly job happens in the first 40 minutes 
after booting in AOSP.

Test: make RunSettingsRoboTests + manual
Bug: 257384343
Change-Id: I437b68719ff5ece73fa33b74cb144f4262528e8c
 2022-12-19 02:36:07 +00:00
TreeHugger Robot
e0f3a47577 Merge "Add RECEIVER_EXPORTED for internal intent based on the PSA" 2022-12-19 00:02:44 +00:00
ykhung
b41b50c3dc Add RECEIVER_EXPORTED for internal intent based on the PSA 
Test: presubmit
Change-Id: I699f1e93cf8c44b046f131014d6200346798336e
 2022-12-19 00:07:27 +08:00
Zaiyue Xue
b9b3dcc0fb Purging battery diff data before calculating perctage and sort. 
Bug: 261820602
Test: manual
Change-Id: I958995721238f32d0360861559ca5e1938ce6d3a
 2022-12-16 16:24:12 +08:00
YK Hung
0b826de287 Merge "Update dock defender helper URL" into tm-qpr-dev am: c89f78c68f am: e7ec6ee025 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742827

Change-Id: I9db48b168b17dc7d7de50f9af15b9bf27f9419c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-16 06:06:08 +00:00
YK Hung
a8e2ded389 Merge "Update string for all defenders" into tm-qpr-dev am: d388dc1809 am: cf8ab7eef3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20743066

Change-Id: I3ef80837be675684e595f47cfe886a198992d167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-16 06:04:43 +00:00
TreeHugger Robot
f8b8835761 Merge "Refactor getting allowlist set from feature provider." 2022-12-16 05:45:52 +00:00
YK Hung
3aca71cfc2 Merge "Move setup optimization mode to main thread" into tm-qpr-dev 2022-12-16 04:53:06 +00:00
Zaiyue Xue
bce700f1db Refactor getting allowlist set from feature provider. 
(1) Use Set<CharSequence> for all the allowlists.
(2) The contains() method of Set<CharSequence> also works for String. No
    need an extra contains() util function.

Bug: 262802531
Fix: 262802531
Test: presubmit
Change-Id: Ib2aaf9a3b8db4618a8c46f138e8d35f15b77c104
 2022-12-16 10:39:26 +08:00
Wesley Wang
d907a12980 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
Merged-In: I2de2181321712f89fadc04bf5000aea91a01485a
(cherry picked from commit 7423f4390c)
 2022-12-15 11:49:14 +00:00
YK Hung
e047b4f400 Merge "Move setup optimization mode to main thread" 2022-12-15 10:56:09 +00:00
Zhenwei Chen
35caf2ffb7 Update dock defender helper URL 
Bug: 261206713
Test: Unit test passed
Change-Id: I6a8489b7e1a54d2c1d88cf6b04c8d1a4c9c6c235
 2022-12-15 10:09:55 +00:00