Hugh Chen
e028bc726b
RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings am: 7b5f8ad883
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17135564
Change-Id: Ic5318ef018542754af6cf7dea5d76fed0e81fdee
2022-03-10 02:12:04 +00:00
Menghan Li
0e1d849838
Merge changes Ia0035222,I309ca48c into tm-dev am: 23074210c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119800
Change-Id: Iac0e1425c02be70fea1a31a8c735743d1ba84dad
2022-03-10 02:11:49 +00:00
Menghan Li
23074210c9
Merge changes Ia0035222,I309ca48c into tm-dev
...
* changes:
Show quick settings tooltip when turning on extra dim in Accessibility setting
Customized accessibility framework features quick setting tooltips content
2022-03-10 01:56:31 +00:00
menghanli
da1d346422
Show quick settings tooltip when turning on extra dim in Accessibility setting
...
Bug: 219751203
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest
Change-Id: Ia00352227f770440691552c72d2597d88b82974c
2022-03-10 06:57:02 +08:00
menghanli
99a9171108
Customized accessibility framework features quick setting tooltips content
...
- Lowercase for one-handed mode, color correction, color inversion, extra dim in quick settings tooltips if these words are not first words.
Bug: 220655084
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityShortcutPreferenceFragmentTest ToggleFeaturePreferenceFragmentTest LaunchAccessibilityActivityPreferenceFragmentTest ToggleAccessibilityServicePreferenceFragmentTest
Change-Id: I309ca48cecb80942112c9d5adde5857c062706c8
2022-03-10 06:40:54 +08:00
Kaiqiang Wang
3ae92de335
Merge "Audio Description preference updates according to IC reviewing: 1) Update audio description preference summary as the Legal team suggestion as b/194376036#comment6 2) Move audio description preference item under "Audio" category as the UX team suggestions as b/194376037#comment#9" into tm-dev am: 58ab365ac0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17037304
Change-Id: I1d2b9da188c83fe94e6f313aebea4434e2a3c964
2022-03-09 21:27:38 +00:00
Kaiqiang Wang
58ab365ac0
Merge "Audio Description preference updates according to IC reviewing: 1) Update audio description preference summary as the Legal team suggestion as b/194376036#comment6 2) Move audio description preference item under "Audio" category as the UX team suggestions as b/194376037#comment#9" into tm-dev
2022-03-09 21:06:36 +00:00
Xinyi Zhou
2a80f46546
Merge "Use FAST_PAIR_SCAN_ENABLED in Nearby Manager" into tm-dev am: 37e36825a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071231
Change-Id: Icde696945b3815fd4386b9b60ee2da45dfd72f58
2022-03-09 19:32:29 +00:00
TreeHugger Robot
7ad1dd1626
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 734d949527 -s ours am: 5db7b3b25f -s ours am: 37279f38c0 -s ours am: b166e75474 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I392bb2e62669ae15e77ec6e6e6b3829bf40c3c2d
2022-03-09 19:31:51 +00:00
TreeHugger Robot
11bcee46ba
[automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf am: 409ac95f00 am: f56cc90557 -s ours am: 88519ff899 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I0d1a7dea54a1b98aec4afba53491786b359fa238
2022-03-09 19:31:43 +00:00
Xinyi Zhou
37e36825a3
Merge "Use FAST_PAIR_SCAN_ENABLED in Nearby Manager" into tm-dev
2022-03-09 19:25:52 +00:00
TreeHugger Robot
b166e75474
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 734d949527 -s ours am: 5db7b3b25f -s ours am: 37279f38c0 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I432edb48c04f584f2f72622cd79bf9f25e5dc51b
2022-03-09 18:55:57 +00:00
TreeHugger Robot
88519ff899
[automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf am: 409ac95f00 am: f56cc90557 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: Ib995142ab0d46c5115b701678309f5aa9bac52ab
2022-03-09 18:55:32 +00:00
TreeHugger Robot
0990c049fa
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 13a4331504 -s ours am: 88f2a7d4c6 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I173a3bcaa8ef5fe5a854a47bdeeb2282a7f833c9
2022-03-09 18:33:48 +00:00
TreeHugger Robot
0576c876ad
[automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod am: 71ded27df2 -s ours am: c91fc6adf0 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I42bc4ac871b07acf8debeff3105b4945a94f3698
2022-03-09 18:32:38 +00:00
TreeHugger Robot
37279f38c0
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 734d949527 -s ours am: 5db7b3b25f -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: Ia65da02df7a81c29d900121fc1df02bb71fc16e4
2022-03-09 18:31:45 +00:00
TreeHugger Robot
f56cc90557
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf am: 409ac95f00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I2d17216bfbef1df5a06127d4c48f3f2d4e2bdfb0
2022-03-09 18:31:37 +00:00
TreeHugger Robot
5db7b3b25f
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 734d949527 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I94279c39c14d4a69700b67ed679d38cf6b622a9e
2022-03-09 18:12:37 +00:00
TreeHugger Robot
409ac95f00
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I411e57fb64404c5d0bab966c6d92a62a3d5c5394
2022-03-09 18:12:28 +00:00
TreeHugger Robot
88f2a7d4c6
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 13a4331504 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I38fa873e56caeb6f28e87f84a27d4b79e8f13a4b
2022-03-09 18:12:06 +00:00
TreeHugger Robot
c91fc6adf0
[automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod am: 71ded27df2 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I3e7dedf3263d073e833a4cd02c306eb1f888b340
2022-03-09 18:12:00 +00:00
TreeHugger Robot
734d949527
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I35974d0cea6185fac6225093e59b8d0bc65516c0
2022-03-09 18:11:59 +00:00
TreeHugger Robot
ebd92c6ee0
[automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into tm-dev am: 201fb5043a -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: Ied39446c5832204997fadcbacb3f52a483acf3fc
2022-03-09 18:11:28 +00:00
Presubmit Automerger Backend
6f889ef7b8
[automerger skipped] [automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb 2p: 407022ff92 am: 56da5fd632 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I8a5a6407d39b8b7940e40f4661f46be0136ae5e9
2022-03-09 18:11:26 +00:00
TreeHugger Robot
13a4331504
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I58fa9d1ad2be1544545b8f769837166fe52d1456
2022-03-09 18:11:06 +00:00
TreeHugger Robot
7b40a559bf
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev
...
* changes:
[automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Change default USB configuration to a RestrictedPreference
2022-03-09 17:54:27 +00:00
TreeHugger Robot
201fb5043a
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into tm-dev
...
* changes:
[automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb 2p: 407022ff92
[automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Change default USB configuration to a RestrictedPreference
2022-03-09 17:54:27 +00:00
TreeHugger Robot
71ded27df2
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod
...
* changes:
[automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Change default USB configuration to a RestrictedPreference
2022-03-09 17:54:27 +00:00
TreeHugger Robot
f48ae98972
Merge "Change default USB configuration to a RestrictedPreference" into sc-dev
2022-03-09 17:54:27 +00:00
Christian Göllner
fb9ee84908
Merge "Device state auto-rotation settings: log device state specific state changes" into tm-dev am: 5ff63a569c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17032838
Change-Id: I636afe81f77967c6e2bb9471e6a172e74a4d1041
2022-03-09 15:35:27 +00:00
Christian Göllner
5ff63a569c
Merge "Device state auto-rotation settings: log device state specific state changes" into tm-dev
2022-03-09 15:12:38 +00:00
Christian Göllner
982f5507c7
Device state auto-rotation settings: log device state specific state changes
...
Bug: 221254073
Test: manually + unit tests
Change-Id: Ie8c0d1489d63fd2d19ad604816150b51ede4bb3b
2022-03-09 13:00:55 +00:00
Etienne Ruffieux
1412da33a5
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93 am: 1a8bbc4a85 am: b60c038016 am: cd09f9cbda
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: I16fc07700a12420b92a442dd1edea9b99452065e
2022-03-09 12:25:12 +00:00
lucaslin
2d04eec7f8
Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 92245b8f57 am: 1264191233 am: 51c66e24f3 am: 40086edf3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I67338648b22b0320cd36a0165fc4b608af8f72f4
2022-03-09 12:22:09 +00:00
Eric Biggers
b2b9447298
[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2 am: fa38c498dc -s ours am: e5f19ebc15 -s ours am: 323c5416ed -s ours
...
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 1d48df59e5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945501
Change-Id: I21ffed0493ea473e355cacdd2ab60f6755090a94
2022-03-09 12:10:15 +00:00
Eric Biggers
2a1473fa93
[automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68 am: cc91b63c1e -s ours am: 799f84fd1c -s ours am: af1aa542b0 -s ours
...
am skip reason: Merged-In Ic63910c870837f5b37e4407ba5b3c7629e925c17 with SHA-1 6167665b8f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500
Change-Id: I00902cf223d3d52319e8b38a7ca3f47aadbc351b
2022-03-09 12:10:14 +00:00
Eric Biggers
96663e9e76
[automerger skipped] Remove CryptKeeperSettings am: 922a11f659 am: 8ec618fc14 -s ours am: 31509c8d31 -s ours am: 3bc698a145 -s ours
...
am skip reason: Merged-In I3ce9894291ea1f1886f21980a86a92bfce38038a with SHA-1 9b18c5d081 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945499
Change-Id: Ia16ed30f4f7785cf4dc7c5f076801acb9489e4ab
2022-03-09 12:10:13 +00:00
Eric Biggers
4ceb98220c
[automerger skipped] Remove CryptKeeper am: 438c3af097 am: 94ebb2e9e5 -s ours am: 2ff19ce69b -s ours am: da5edda772 -s ours
...
am skip reason: Merged-In I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9 with SHA-1 f8ca0a448c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945498
Change-Id: I682b46584c44fb12453dcc13f6e96472f2c3eed2
2022-03-09 12:10:12 +00:00
Eric Biggers
16808d4a63
[automerger skipped] Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp am: a00c327707 -s ours am: e92bac3118 -s ours
...
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17110591
Change-Id: I016484f655421273710796b664d86657c412cf02
2022-03-09 11:58:55 +00:00
Eric Biggers
ba01b74178
[automerger skipped] Remove FDE support from accessibility settings am: 1d48df59e5 -s ours am: 7e34dd199d -s ours
...
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17110591
Change-Id: I023f575212821f4e1cc2b2216a35326d55cfb8a1
2022-03-09 11:58:54 +00:00
Etienne Ruffieux
cd09f9cbda
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93 am: 1a8bbc4a85 am: b60c038016
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: I560704cca582ef3e27638bb6df3693c71adbd874
2022-03-09 11:43:28 +00:00
Xin Li
e59429af7c
[automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours am: 0cf175a248 -s ours am: 41a3026a47 -s ours
...
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2013280
Change-Id: Ie035654785c0543a0ecab68d7055f8c057907102
2022-03-09 11:39:04 +00:00
Xin Li
a28772f40c
[automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours am: d77cc96126 -s ours am: df5b4f0bad -s ours
...
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2013280
Change-Id: Ibc71753cdb93a05fa418558f1306d6ad6fc9c382
2022-03-09 11:36:16 +00:00
Etienne Ruffieux
b60c038016
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93 am: 1a8bbc4a85
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: Idd8a5be969d228f501c245d81bdc09b3496f7f5a
2022-03-09 11:32:11 +00:00
lucaslin
40086edf3f
Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 92245b8f57 am: 1264191233 am: 51c66e24f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I5f3bda846d5193d5de7d39a393d80b2105a80c26
2022-03-09 11:25:23 +00:00
Eric Biggers
323c5416ed
[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2 am: fa38c498dc -s ours am: e5f19ebc15 -s ours
...
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 1d48df59e5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945501
Change-Id: I7de40361eddca0640dd14c8033253cd1fc1ff7bd
2022-03-09 11:20:50 +00:00
Eric Biggers
af1aa542b0
[automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68 am: cc91b63c1e -s ours am: 799f84fd1c -s ours
...
am skip reason: Merged-In Ic63910c870837f5b37e4407ba5b3c7629e925c17 with SHA-1 6167665b8f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500
Change-Id: Ie9fdc26f0dafbb159a2d9b956241f93dac4a9003
2022-03-09 11:20:49 +00:00
Eric Biggers
3bc698a145
[automerger skipped] Remove CryptKeeperSettings am: 922a11f659 am: 8ec618fc14 -s ours am: 31509c8d31 -s ours
...
am skip reason: Merged-In I3ce9894291ea1f1886f21980a86a92bfce38038a with SHA-1 9b18c5d081 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945499
Change-Id: I2aa8009d3bac8b5786c4414811b854df39ad53f3
2022-03-09 11:20:47 +00:00
Eric Biggers
da5edda772
[automerger skipped] Remove CryptKeeper am: 438c3af097 am: 94ebb2e9e5 -s ours am: 2ff19ce69b -s ours
...
am skip reason: Merged-In I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9 with SHA-1 f8ca0a448c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945498
Change-Id: Ib5c44454b76f8216dd306ba7cd3d398df18cd50e
2022-03-09 11:20:43 +00:00
Hugh Chen
7b5f8ad883
RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings
...
Implemented the Spatial Audio and Head Tracking options, make these
features could be controlled in bluetooth detail settings.
Bug: 218960300
Test: make -j64 RunSettingsRoboTests
Change-Id: I880cc7a10fc5e2fa5d1052fff5a7b589a4ff60df
(cherry picked from commit bc2f30ca67 )
2022-03-09 11:02:34 +00:00