Commit Graph

100671 Commits

Author SHA1 Message Date
TreeHugger Robot
48eb6726c3 Merge "Show lock icon in restricted settings dialog" into tm-dev 2022-03-10 16:38:09 +00:00
Marie Matheson
0b82bf9df3 Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev 2022-03-10 13:40:54 +00:00
Ricky Wai
6840252c11 Merge "Apply restricted settings to notification access." into tm-dev 2022-03-10 12:04:49 +00:00
Les Lee
4801983e1f Merge "wifi setting: Add psk length check" into tm-dev 2022-03-10 11:28:43 +00:00
TreeHugger Robot
439bd335a4 Merge "Add highlight menu key for app pages" into tm-dev 2022-03-10 09:56:35 +00:00
Chaohui Wang
8ff1d57150 Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd am: dc70876ddb am: b6799b65c7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419

Change-Id: Icf0a5207f8cbb41b6cfac623b34e12b58fb76b24
2022-03-10 08:43:15 +00:00
Chaohui Wang
b6799b65c7 Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd am: dc70876ddb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419

Change-Id: Id0eb4d409cb9a434e608cc255056de08e9428050
2022-03-10 08:22:21 +00:00
Chaohui Wang
dc70876ddb Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419

Change-Id: Ibb221e416ecc360fb3460ef00defbf35e8abf567
2022-03-10 07:59:55 +00:00
Jason Chiu
bbb9f20346 Add highlight menu key for app pages
Fix: 216402156
Test: manual
Change-Id: I8a79e72e07739aca831a62b8186bdaaa3dc69870
2022-03-10 15:34:55 +08:00
Chaohui Wang
aee21e8cbd Merge "Clean up unused profile_select_tablayout." 2022-03-10 07:30:04 +00:00
PETER LIANG
66a510d2dd Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev 2022-03-10 05:40:17 +00:00
PETER LIANG
b4e91fa866 Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev 2022-03-10 05:40:17 +00:00
Chaohui Wang
34261e25a7 Clean up unused profile_select_tablayout.
Change-Id: If1f58f13a8cf14bf078bce16c23fed6726ff223a
2022-03-10 04:57:00 +00:00
Chaohui Wang
c2ca082457 Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226 am: 7e7924bf35 am: 0f1547cb76
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296

Change-Id: I5a281e84d4c009fb0af9238f49a2e98dc9a7d17b
2022-03-10 04:39:13 +00:00
Chaohui Wang
0f1547cb76 Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226 am: 7e7924bf35
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296

Change-Id: I115858d668df4fe332b15081b1b68ed4768ad938
2022-03-10 04:18:12 +00:00
Menghan Li
3c01414b4c Merge "Clean up accessibility quick settings "tooltips" for singular purpose" into tm-dev 2022-03-10 03:55:30 +00:00
Chaohui Wang
7e7924bf35 Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296

Change-Id: I0dfa53afd25bcd94624f6f79477a4c8b7a1921d2
2022-03-10 03:39:17 +00:00
Chaohui Wang
0ba498b226 Merge "Fix App Compatibility Settings' lifecycle" 2022-03-10 03:20:25 +00:00
TreeHugger Robot
f08958b44d Merge "RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings" into tm-dev 2022-03-10 02:05:38 +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
075364f147 Clean up accessibility quick settings "tooltips" for singular purpose
Bug: 220655084
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsTooltipWindowTest LaunchAccessibilityActivityPreferenceFragmentTest ToggleAccessibilityServicePreferenceFragmentTest
Change-Id: I771ad407b04375be2679c2237a970ee418b9bf37
2022-03-10 07:51:48 +08: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
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
37e36825a3 Merge "Use FAST_PAIR_SCAN_ENABLED in Nearby Manager" into tm-dev 2022-03-09 19:25:52 +00:00
Marie Matheson
a0ce0e6340 Bug fix - when enrolled, biometrics have ok safety state.
Bug: 222336582
Test: atest SettingsUnitTests
Change-Id: Ia90329fa126b181e87ff7ed626ba33eca1e6bf7d
2022-03-09 19:24:18 +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
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
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
Peter_Liang
d2fc78d797 Fix that the theme of "Vision Settings" was inconsistent with "Anything else?".
Remove theme attribute in the xml to avoid overriding.

Fix: 220127506
Fix: 219417232
Fix: 219415822
Fix: 223341110
Fix: 222415445
Fix: 219592951
Test: manual test
Change-Id: I8075be594714dfbd941cdcc642453500f093fc26
2022-03-10 01:07:26 +08:00
Ricky Wai
ffc747e820 Show lock icon in restricted settings dialog
Bug: 221847335
Test: After applying restricted settings, the dialog shows the icon now.
Change-Id: If4b55d4320956625141973c337ae7ef2a3bd8dbc
(cherry picked from commit 18602ea97a)
2022-03-09 16:51:35 +00:00
Ricky Wai
d09d62a55e Apply restricted settings to notification access.
Bug: 202130031
Test: Able to boot without error
Test: When app is installed by PackageInstaller app, notification
access is being restricted. The restriction is being removed after
turing it restricted settings off for that app.

Change-Id: I9c1fbc80dd2ca4cc483a60dfa9d043aaa99cde87
2022-03-09 16:51:09 +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
Peter_Liang
2bfb31c877 Apply the settings lib style into the reset button of "Display size and text".
Bug: 222415445
Fix: 220638395
Test: manual test
Change-Id: I001c9eff69f46f4ba142c3e5e428b1a92169ba7d
2022-03-09 13:42:07 +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
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
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