Behnam Heydarshahi
53c32d487a
Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90 am: 4fc098dc1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598
Change-Id: I2ed97051fc0602324c12960e3696c4933911abcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 15:14:24 +00:00
Behnam Heydarshahi
4fc098dc1b
Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598
Change-Id: I1dbbde115a9e92ecc1b602607827d51ec2078102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 14:34:49 +00:00
Behnam Heydarshahi
ee56e95f90
Merge "Implement a separate controller for ring volume" into tm-qpr-dev
2023-01-11 14:08:01 +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
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
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
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
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
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
Amy Hsu
0d9e5d600c
[RRS] show resolution option on Settings page.
...
Due to the special width/ height of the device, we have to modify the
available condition otherwise the resolution option cannot be shown on Settings.
Bug: 258346214
Test: Lunch Settings and check the Display page
Change-Id: I577e0e1227727aab75787c1f6115091e0c6158e1
2023-01-10 07:41:43 +00:00
Bonian Chen
61c45064cd
[Settings] Limit height of TextView when text too long
...
Adjust the layout through having ConstraintLayout for limiting the
height of TextView.
Bug: 205460459
Test: local
Change-Id: Ic15af4c9be393a6855d78a5d9af086b099c9b689
2023-01-10 07:36:21 +00:00
Chaohui Wang
12b2f7cbe9
Update for AppOpsController changes
...
Bug: 235727273
Test: Manually with Settings
Change-Id: Ic4f4d6354b471500ee727e513ff161f0ee1e3225
2023-01-10 15:33:55 +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
Bonian Chen
817786c698
Merge "[Settings] Support of Primary IMEI feature"
2023-01-10 05:39:15 +00:00
tom hsu
c03ff3b870
Expose the regional preferences page
...
- Settings -> language & input -> Regional preferences
Bug: b/246929960
Test: atest pass.
Change-Id: I650111147a95a09b3b52518e6369ede0a4275857
2023-01-10 13:11:08 +08:00
Milton Wu
dc8f967315
Merge "Refactor FingerprintEnrollFindSensor"
2023-01-10 02:44:35 +00:00
Nate Myren
027d64c84c
Add "Data Sharing Updates" to legacy Privacy Page
...
Note: Strings are non-final
Test: manual
Fixes: 261663929
Change-Id: Ia036a3bf715d10f94f17faf5b571896ca229a39a
2023-01-09 16:47:35 -08:00
Milton Wu
3be7385d90
Refactor FingerprintEnrollFindSensor
...
Refactor FingerprintEnrollFindSensor to 3 pages for different sensor
types, and apply MVVM for them.
Bug: 259664912
Bug: 260957195
Bug: 260957816
Test: atest FingerprintRepositoryTest FingerprintEnrollmentActivityTest
AutoCredentialViewModelTest FingerprintEnrollIntroViewModelTest
Change-Id: Iace790952567cac13e61e5175e90555d4da7dfe2
2023-01-10 07:52:37 +08:00
TreeHugger Robot
25e8018d78
Merge "Fix settings bug (pt 2)"
2023-01-09 22:25:22 +00:00
Menghan Li
526ababc60
Merge "Dynamic update a11y settings when a11y service target is disabled"
2023-01-09 22:06:26 +00:00