PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,108 Commits 1 Branch 0 Tags
e8f2631f25a96af3b792ed75b8ba848459f652bb
Commit Graph

119108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zaiyue Xue
e8f2631f25 Fix b/264582296: Incorrect app battery usage after switching between 'restricted/unrestricted/optimized'. 
This bug is due to the instance fields state is not refreshed after setAppUsageState(). When setting back to the original mode in the same page, getAppOptimizationMode(mMode, mAllowListed) still returns the original mode. So the setting back action is ignored.

Bug: 264582296
Fix: 264582296
Test: manual
Change-Id: I4da5dd7f1ca2660661f842a67b7d799aabd1ba05
 2023-01-12 12:13:48 +08:00
Vania Januar
c9e42d4d73 Merge "Update strings for stylus settings preferences." 2023-01-11 12:52:04 +00:00
TreeHugger Robot
49b7e7d315 Merge "Fix one build failure when running in studiow." 2023-01-11 12:35:25 +00:00
Treehugger Robot
88e923f7ce Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746 am: 8601b70e1c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: I1e2cabff29c20c9a759743116ba9d57710c3d1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 12:17:05 +00:00
TreeHugger Robot
e0050d3abf Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev am: fb0986623f am: e9da17a8b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904549

Change-Id: I4cfcbf8cdfeafdd2547ed81bf3953eb371296ee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 12:16:51 +00:00
TreeHugger Robot
5404ade7ec Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev am: ecb7c54fc5 am: b464bfa049 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904550

Change-Id: I7be000514ace73753e35325fe9e62bb30679e15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 12:15:18 +00:00
Treehugger Robot
8601b70e1c Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ibb2373d9410439be710b78c9e61c697f87bb28b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:53:43 +00:00
TreeHugger Robot
e9da17a8b9 Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev am: fb0986623f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904549

Change-Id: I1ce36528fa8ae6d30ad6aecc880c3bbf905fabba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:36:19 +00:00
TreeHugger Robot
b464bfa049 Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev am: ecb7c54fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904550

Change-Id: I4e713518a4f0de69a4d85514315048d438b53fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:35:17 +00:00
Treehugger Robot
9c8ff84746 Merge "Amend "Reset notification importance" list item style" am: aef592eb18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ife8b88093010ff9fea43758057d334bbea50540a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:19:53 +00:00
TreeHugger Robot
fb0986623f Merge "Fix Content Capture service starting after restriction" into tm-qpr-dev 2023-01-11 11:05:12 +00:00
TreeHugger Robot
ecb7c54fc5 Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev 2023-01-11 11:05:07 +00:00
TreeHugger Robot
569becdb7f Merge "Use (the last existing timestamp in DB + 1) as the start time of usage event query to avoid loading the same events repeatedly." 2023-01-11 10:51:40 +00:00
Treehugger Robot
aef592eb18 Merge "Amend "Reset notification importance" list item style" 2023-01-11 10:31:55 +00:00
Bonian Chen
4ef920e9ef Merge "[Settings] Limit height of TextView when text too long" 2023-01-11 10:17:51 +00:00
Zaiyue Xue
53eb9ce22d Fix one build failure when running in studiow. 
Test: manual
Change-Id: I6abcbcfa01d60799a77d45c5a89306b5a4c99285
 2023-01-11 17:43:36 +08:00
Zaiyue Xue
43ace6ed33 Merge changes from topic "feature0" 
* changes:
  Refactor processBatteryDiffData() from DataProcessor to BatteryDiffData class.
  Refactor PowerUsageFeatureProvider: Cache the config set to avoid generating the set again.
 2023-01-11 08:57:29 +00:00
TreeHugger Robot
24dbaeba1e Merge "Clean up unused code in AdvancedPowerUsageDetail class" 2023-01-11 08:54:30 +00:00
Kuan Wang
6da66f9a5c Use (the last existing timestamp in DB + 1) as the start time of usage 
event query to avoid loading the same events repeatedly.

queryEvents API will return the events within [start, end). In the
hourly job, if we query the events from the latest existing time, the
events happening at the latest time will be saved for multiple times
into database. This aims to avoid this issue.

Test: make RunSettingsRoboTests
Bug: 265110147
Fix: 265110147
Change-Id: I408e88b0e15fe22585906261935854cf47707f9c
 2023-01-11 16:18:55 +08:00
Zaiyue Xue
cad4c069bd Clean up unused code in AdvancedPowerUsageDetail class 
Bug: 262802531
Test: presubmit
Change-Id: Ide91bd5312296945effb5a54422bda2c9623341d
 2023-01-11 14:27:53 +08:00
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
TreeHugger Robot
353cde7109 Merge changes from topic "LifecycleEffect" 
* changes:
  Redirect to AppInfoSettings when SPA is on
  Reload package info for each time enter App Info
 2023-01-11 05:35:07 +00:00
Zaiyue Xue
0ddc5257f5 Merge "[Battery usage U] [UI] Update the text in footer" 2023-01-11 05:34:41 +00:00
Shen Lin
1721d0f276 Amend "Reset notification importance" list item style 
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.

Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
 2023-01-11 05:21:59 +00:00
Edgar Wang
47fbf1d333 Merge "Set key for the SwitchPreferences of Connected devices > USB" 2023-01-11 04:07:05 +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
Andy Hung
11264e9a00 Merge "Bluetooth Settings: Restore Spatial Audio Settings" 2023-01-11 03:29:14 +00: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
TreeHugger Robot
47aed3060e Merge "Add "Data Sharing Updates" to legacy Privacy Page" 2023-01-11 02:26:04 +00:00
Arc Wang
c8c1cfda38 [automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946 -s ours am: cef3637f4c -s ours am: b169c48705 -s ours 
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213

Change-Id: I4d641efd90bd9cd83d00616e4f9b19a1bc7b17c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:23:21 +00:00
Arc Wang
2d9b281595 [automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d -s ours am: e3a8b88137 -s ours am: a9f470ab46 -s ours 
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601

Change-Id: I73ecabcc25847fa4309ffc50f37ae35097233ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:23:19 +00:00
Arc Wang
6d0def1b87 [automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281 am: b7c98a18c9 -s ours 
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 17cd85b946 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211

Change-Id: I32243ee3ef1647611ff2f3928d6e9e639c0e67ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:23:10 +00:00
Arc Wang
5175b552f3 [automerger skipped] Allow 2-pane deep link to access unexported Activity am: 4703a5a61b -s ours 
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 960c96474d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20758917

Change-Id: I1302e4a55552420f36996bca2b142631da310455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:22:59 +00:00
Bill Yi
cce02ab84a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76b6947b01 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738954

Change-Id: I2feed138828f25a29f54c570cabd7bfc792c2a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:21:24 +00:00
TreeHugger Robot
6eedc1cdfe Merge "Update string" into tm-qpr-dev am: 8dc66bc482 am: 26f47177a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20925429

Change-Id: I08496788be3e791658c54564e59f0e462ca9669e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-10 20:57:52 +00:00
TreeHugger Robot
26f47177a3 Merge "Update string" into tm-qpr-dev am: 8dc66bc482 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20925429

Change-Id: I484277c3466ccc0a48f276e3bd0b933ab6be34d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-10 20:00:50 +00:00
TreeHugger Robot
8dc66bc482 Merge "Update string" into tm-qpr-dev 2023-01-10 19:28:16 +00:00
Hao Dong
22fc2f387b Merge "Add a flag for moving UdfpsEnroll* from SystemUI to settings." 2023-01-10 18:02:42 +00:00
Lucas Silva
59537681bc Only show communal settings to the primary user am: e33639f117 am: 600741c78c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20859979

Change-Id: I8562766dd513521b8f3dcf3519f0ee74cd3a052d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-10 17:55:47 +00:00
Lucas Silva
600741c78c Only show communal settings to the primary user am: e33639f117 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20859979

Change-Id: Ia66b6011f37412bbbdf783b3d5f844446f4fc1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-10 17:22:02 +00:00
Amy Hsu
7e36e664b6 Merge "[RRS] show resolution option on Settings page." 2023-01-10 16:47:56 +00:00
Julia Reynolds
fc63046f32 Update string 
Test: view string in UI
Fixes: 262094151
Change-Id: I4f55c340d3144d446465d64008d9d92d622425ae
 2023-01-10 16:23:57 +00:00
Chaohui Wang
910de9454f Merge "Update for AppOpsController changes" 2023-01-10 15:42:43 +00: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
Vania Januar
f640bb1e6d Merge "Show None default app in stylus preference if no Notes holder." 2023-01-10 12:22:22 +00:00
Vania Januar
32425708e4 Update strings for stylus settings preferences. 
Test: just strings
Change-Id: I8ce4b4b12fff7535fb60097a1b30d9763505c3d3
 2023-01-10 12:07:38 +00: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
Tom Hsu
5fc863fc01 Merge "Expose the regional preferences page" 2023-01-10 09:17:30 +00:00
Kuan Wang
72baf601fd Merge "Add logging for total screen-on time and foreground usage time." 2023-01-10 09:12:40 +00:00
Jason Hsu
e0301f7aa4 Merge "[hearing devices page] Launch 'Hearing decice controls' to Accessibility hearing device page." 2023-01-10 09:05:55 +00:00