Commit Graph

102096 Commits

Author SHA1 Message Date
PETER LIANG
87910b8e70 Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev am: b4e91fa866 am: b4d6e5956d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17100789

Change-Id: I6f5dcfdc074c7b29fe92de9dea52e10adaf68cfb
2022-03-10 06:20:57 +00:00
PETER LIANG
c23fa1ebfe Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev am: 66a510d2dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17137385

Change-Id: Icccabb0ce9a5c90d969b0fb1abd09321ba07c27a
2022-03-10 05:57:49 +00:00
PETER LIANG
b4d6e5956d Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev am: b4e91fa866
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17100789

Change-Id: I7c722a0ad6c66e541ea087f0e5b100544e6e1d72
2022-03-10 05:57:48 +00:00
PETER LIANG
9ecf3b2b44 Merge "Fix that the theme of "Vision Settings" was inconsistent with "Anything else?"." into tm-dev am: 66a510d2dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17137385

Change-Id: Idada6dac443ebf07e64fa387354d0ae7911fc8c1
2022-03-10 05:57:46 +00:00
PETER LIANG
6dfedd2fec Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev am: b4e91fa866
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17100789

Change-Id: Ic524c38aad4053e72eb1cab65fc99db4146c6c0e
2022-03-10 05:57:44 +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
d6814ba19f Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226 am: 7e7924bf35 am: 0f1547cb76 am: c2ca082457 am: 8cb607b188
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296

Change-Id: Ifd9eb8c72a8130f8a44a2c1f9daa7371f5f3c603
2022-03-10 05:24:08 +00:00
Chaohui Wang
8cb607b188 Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226 am: 7e7924bf35 am: 0f1547cb76 am: c2ca082457
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296

Change-Id: I616fb3fa43af7c1c1095c67e4d0c44bc1adc6268
2022-03-10 05:01:49 +00:00
Chaohui Wang
bfa9a0b2a2 Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226 am: 7e7924bf35 am: 0f1547cb76 am: c2ca082457
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296

Change-Id: Ia32e6b5c62bd05256b2160a96811449113f8c3fb
2022-03-10 05:01:43 +00:00
Chaohui Wang
34261e25a7 Clean up unused profile_select_tablayout.
Change-Id: If1f58f13a8cf14bf078bce16c23fed6726ff223a
2022-03-10 04:57:00 +00:00
Menghan Li
6a23123d84 Merge "Clean up accessibility quick settings "tooltips" for singular purpose" into tm-dev am: 3c01414b4c am: dc6216a120
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17145350

Change-Id: I5cc418825a3f88ee246ed681bd7ae4e2747b5a3a
2022-03-10 04:40:05 +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
Menghan Li
dc6216a120 Merge "Clean up accessibility quick settings "tooltips" for singular purpose" into tm-dev am: 3c01414b4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17145350

Change-Id: Ib3feb2fd4802f84df4fdd3577d5848fc3d0bfeb4
2022-03-10 04:18:55 +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
76a25d8e26 Merge "Clean up accessibility quick settings "tooltips" for singular purpose" into tm-dev am: 3c01414b4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17145350

Change-Id: Ic6fad34b8a693cf929f8f0d8a15a409cc904350f
2022-03-10 04:17:43 +00:00
Joshua Mccloskey
5eda7f09d0 FPSettings depends on SensorProps for maxEnrolls
Test: Verified that AIDL FP devices honor the maximum number
of fp's allowed according to the HAL.
Fixes: 223617233

Change-Id: Ia0c46647d77ce52d4fe95154eae8d8b656456f53
2022-03-10 04:05:33 +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
e64fd224f1 [automerger skipped] Merge "RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings" into tm-dev am: f08958b44d am: 2dd5105170 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd400151454ea1208f050430637371b24e9f486c
2022-03-10 02:37:18 +00:00
Hugh Chen
6c0ac31fac [automerger skipped] RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings am: 7b5f8ad883 am: e028bc726b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I901a0a0b93abe15412a97e907eac660d40ca72f0
2022-03-10 02:37:17 +00:00
Menghan Li
3101884d37 Merge changes Ia0035222,I309ca48c into tm-dev am: 23074210c9 am: 0e1d849838
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119800

Change-Id: I3a0afd17318d8968d34550fe5f44e3508c812af1
2022-03-10 02:37:00 +00:00
TreeHugger Robot
a3b1d5340c [automerger skipped] Merge "RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings" into tm-dev am: f08958b44d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff771f6907d6974738fca71c273326a2281bbc2d
2022-03-10 02:12:07 +00:00
Hugh Chen
838da95b9f [automerger skipped] RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings am: 7b5f8ad883 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I145827f25df7441ddf73423f05e5957b5fc27828
2022-03-10 02:12:06 +00:00
TreeHugger Robot
2dd5105170 Merge "RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings" into tm-dev am: f08958b44d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17135564

Change-Id: If1608dbc3913718b96a6be663e56459e95f06659
2022-03-10 02:12:05 +00:00
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
b2018ffeca 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: Idb35efe4425b715c6a7a352e6a940cd149cc6bf4
2022-03-10 02:11:50 +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
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
Yomna Nasser
fa9d529b42 Check KEY_PREFER_2G_BOOL before showing 2G options.
Bug: b/181838883
Test: manual & atest -c EnabledNetworkModePreferenceControllerTest
Change-Id: I164b62fd5a766966b793f798305447b9e2009643
2022-03-09 22:20:43 +00:00
Kaiqiang Wang
d8e9381272 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 am: 3ae92de335
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17037304

Change-Id: I8d58c5342b2cf7880473d720da21ff900c069074
2022-03-09 21:50:53 +00: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
eefc6300ce 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: I3d5965e85ec79d6b538eeb65ecd1bcf795c5f321
2022-03-09 21:27:18 +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
f3cf40faf7 Merge "Use FAST_PAIR_SCAN_ENABLED in Nearby Manager" into tm-dev am: 37e36825a3 am: 2a80f46546
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071231

Change-Id: I98b56f39e8f096cd3b7ccef548067190ea9abd2d
2022-03-09 19:54:03 +00:00
TreeHugger Robot
e032562ad5 [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: 7ad1dd1626 -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: Id1e050bff7208dd035e2aa77e4e183a3ef12c556
2022-03-09 19:53:45 +00:00
TreeHugger Robot
973f6bf3d9 [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: 11bcee46ba -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: I4556b50098b6f44d3f5e6496855931b14a7ace1b
2022-03-09 19:53:35 +00:00
Xinyi Zhou
30ae6e3e4d 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: Ie5d6cf9f993250b629df0b6631fe023cf2a1c54e
2022-03-09 19:34:13 +00:00
TreeHugger Robot
05a7cab96e [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: I20fde8c37b34d0dc003fbc7ea1a99232bdddee23
2022-03-09 19:33:47 +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
b2f2de7bda [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: I404ebfbdfe55d9397ce66f628c618d0a3b0b5b59
2022-03-09 19:31:52 +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
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