Chaohui Wang
aee21e8cbd
Merge "Clean up unused profile_select_tablayout."
2022-03-10 07:30:04 +00:00
Jay Thomas Sullivan
cd2109a17b
Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES
...
This permission was only created very recently, and it is unlikely that
any apps are using it yet.
After its creation, it was decided that it should be renamed.
Bug: 223691971
Test: atest CtsPermissionTestCases CtsPermission3TestCases
Change-Id: If82cee5995a2adc8e1b1fcc88ea7b540e7df0fac
2022-03-09 22:34:52 -08: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
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
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
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
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
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
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
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
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
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
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
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