Diya Bera
271362af05
Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev am: dc071e94cd am: 81ab030e4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919289
Change-Id: I2d25a70f82548cc1ae754a8b6376fbc831f1f0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 00:55:03 +00:00
Joshua Mccloskey
bc1291e163
Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev am: 7b8bddaac0 am: dc0f04d7ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20931688
Change-Id: I9ead82f334b4ca2b69989707d5890f9e8cdf3ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 00:53:55 +00:00
Diya Bera
81ab030e4c
Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev am: dc071e94cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919289
Change-Id: I18729fd0f253008a29d9da947e833cab42238efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 00:17:04 +00:00
Joshua Mccloskey
dc0f04d7ee
Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev am: 7b8bddaac0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20931688
Change-Id: I22bee3710fa6cdf31c15aae69691f94ddf38aa80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 00:12:33 +00:00
Diya Bera
dc071e94cd
Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev
2023-01-11 23:52:35 +00:00
Joshua Mccloskey
7b8bddaac0
Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev
2023-01-11 23:43:54 +00:00
Joshua McCloskey
dfaa7a1b7f
Added performant auth feature am: b8695b8e76 am: 4915a5932d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20937285
Change-Id: I7427307ca99ce6512a0b66910939777193a10d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 21:49:51 +00:00
Joshua McCloskey
4915a5932d
Added performant auth feature am: b8695b8e76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20937285
Change-Id: I1214d53edf57e1b45efd3d81c7e0305d83e94459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 21:38:32 +00:00
Joshua McCloskey
b8695b8e76
Added performant auth feature
...
Test: Manually verified in settings that the performant auth
feature(fingerprint) is disabled by default
Bug: 261216422
Bug: 265031172
Change-Id: I6422b12f801d038fa514758eca34efcbfdeef27a
2023-01-11 16:43:54 +00:00
TreeHugger Robot
3bc11c7ad3
Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07 am: 02cace2f67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103
Change-Id: I7efaad7adeb7f07e36608dda8eb05a72133659fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 15:53:08 +00:00
TreeHugger Robot
02cace2f67
Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103
Change-Id: I1c586d8d135b6238662b228b2101ab4de4d369ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 15:30:41 +00:00
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
TreeHugger Robot
61f81ffb07
Merge "Update wallet setting availability" into tm-qpr-dev
2023-01-11 14:54:39 +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
Joshua McCloskey
3e0f8365f5
Fixed scroll issue w/ FP settings
...
Test: Verified fingerprint preferences are not shown over the fingerprint title when device is rotated in settings screen
Fixes: 259338792
Change-Id: Ie99e584247bb52b097e949d0c8c0ed096543aa21
2023-01-11 02:04:41 +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