PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,855 Commits 1 Branch 0 Tags
53e410b4e9a507e5056238ffdc07c20f7ded1ef1
Commit Graph

100855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
53e410b4e9 Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev am: fdd48399d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17158224

Change-Id: I613c7a2508544a7aa7e5f5783e4a6bf70a439a25
 2022-03-10 21:12:30 +00:00
TreeHugger Robot
fdd48399d9 Merge "Fix WhenToDreamPreferenceControllerTest" into tm-dev 2022-03-10 20:54:28 +00:00
Lucas Silva
b418d4272f Fix WhenToDreamPreferenceControllerTest 
The current test uses a mock context, which doesn't support all the
methods being used. Instead, switch to using a real context.

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Bug: 216036457
Change-Id: Ib431d27943a8a732da1ef2dfad2eb1ce7ede36c2
 2022-03-10 13:49:47 -05:00
TreeHugger Robot
21ffd376fa Merge "Show lock icon in restricted settings dialog" into tm-dev am: 48eb6726c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140467

Change-Id: I939ee3e421eaa700261a59f37bb5974c078706dd
 2022-03-10 18:10:30 +00:00
Marie Matheson
8bb49c90cc Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev am: 0b82bf9df3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17142588

Change-Id: I402bd68845db5aefddffb387181fdadf0707798b
 2022-03-10 18:01:25 +00:00
Ricky Wai
e1c3fce993 Merge "Apply restricted settings to notification access." into tm-dev am: 6840252c11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17140466

Change-Id: I068649b895f6c632919d6b299c51f4b96dc24909
 2022-03-10 17:56:46 +00:00
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
b55282a2f6 Merge "wifi setting: Add psk length check" into tm-dev am: 4801983e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17130190

Change-Id: I4532d9a8b28012ac97ac60fdf8d0a21466003e9a
 2022-03-10 11:58:27 +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
2d9363bab4 Merge "Add highlight menu key for app pages" into tm-dev am: 439bd335a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17148789

Change-Id: Iac284cb2054da317c6d713d32b4233a3ccbd17d0
 2022-03-10 10:14:55 +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
6a7dc39b69 Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd am: dc70876ddb am: b6799b65c7 am: 8ff1d57150 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419

Change-Id: I60a492fd2962afd2868fe6f1dc74b6d311ae983f
 2022-03-10 09:04:38 +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
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
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
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