Commit Graph

101926 Commits

Author SHA1 Message Date
Lucas Silva
ee3cf38f88 Merge "Update screen saver overlay toggle description" into tm-dev am: 7b9593761a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I3c5ebb9243dc9f4f6cf23277b4b7fdbaf37fa925
2022-03-23 22:48:34 +00:00
Lucas Silva
202f5716ca Merge "Update screen saver overlay toggle description" into tm-dev am: 7b9593761a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I6d4df023486a340b79527071523a0af82961d0cf
2022-03-23 22:48:23 +00:00
Yi Jiang
2260f2e9cc Merge "Moves battery saver warning message below Screen Attention setting." 2022-03-23 22:41:44 +00:00
Lucas Silva
7b9593761a Merge "Update screen saver overlay toggle description" into tm-dev 2022-03-23 21:56:59 +00:00
Lucas Silva
4cc583982b Merge changes from topic "presubmit-am-03ffa3d76b0646d890555c8d427704b5" into tm-mainline-prod
* changes:
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d
  Update screen saver overlay toggle description
2022-03-23 21:56:59 +00:00
Lucas Silva
e5fa785dfa Merge changes from topic "presubmit-am-03ffa3d76b0646d890555c8d427704b5"
* changes:
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 2p: 072d2beb83
  [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d
  Update screen saver overlay toggle description
2022-03-23 21:56:59 +00:00
TreeHugger Robot
3c431c8c7f Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c am: e9fae331a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: I9b6812d0e449b43fdab07a2b877279eef7c0c37a
2022-03-23 20:31:49 +00:00
TreeHugger Robot
e9fae331a5 Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: Ic3909624df98329c215eb400aeee0d9d4838a0fe
2022-03-23 20:14:25 +00:00
TreeHugger Robot
80bb0d7986 Merge "Add summary to "Vibration & haptics" settings" into tm-dev am: e7f902f21c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17324095

Change-Id: Ic42a9fdf552b40d300604ee1a04b4d28f6eac3bc
2022-03-23 20:14:07 +00:00
TreeHugger Robot
e7f902f21c Merge "Add summary to "Vibration & haptics" settings" into tm-dev 2022-03-23 19:58:55 +00:00
Xinyi Zhou
da41600d8c [automerge] Update API according to API council feedback 2p: ad5e65a338 2p: d883631dc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Bug: 225116248
Change-Id: I98784295a0832770b27568af8a7507e0ae39eea3
2022-03-23 18:54:35 +00:00
Xinyi Zhou
d883631dc5 [automerge] Update API according to API council feedback 2p: ad5e65a338
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Bug: 225116248
Change-Id: I454e3e7139c3151bd2e5f1f1b0185f44c78d3306
2022-03-23 18:54:23 +00:00
Xinyi Zhou
ad5e65a338 Update API according to API council feedback
Test: built and verified logs
Bug: 225116248
Change-Id: I9e0f82446ddd80737b3ee5f92a1bbb1838eef30e
2022-03-23 11:50:37 -07:00
TreeHugger Robot
b81c42d043 Merge "Fix System language option missing and locale region missing issue" 2022-03-23 18:16:07 +00:00
TreeHugger Robot
0cad38f06f Merge "[Panlingual][patch] Handle onLocaleSelected." 2022-03-23 18:16:07 +00:00
Matt Pietal
607f402bff [automerge] Update multiple users strings 2p: 296b904bf1 2p: 6a966b0aff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Bug: 219078700
Change-Id: I06147b00879436ddbc477061c6dfb40c5e8c12d7
2022-03-23 17:40:52 +00:00
Matt Pietal
6a966b0aff [automerge] Update multiple users strings 2p: 296b904bf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Bug: 219078700
Change-Id: Ib2e47960b4602cacf727f18d47fe405b850c3ef4
2022-03-23 17:40:45 +00:00
Matt Pietal
296b904bf1 Update multiple users strings
To match latest guidance

Bug: 219078700
Test: manual
Change-Id: Ieef884e046e1e1798cc98a553bcd902c1374d069
2022-03-23 13:39:42 -04:00
Lucas Silva
4bfc3ea2d1 [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d 2p: 072d2beb83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: Ia1067f8cc23c198c42209ae0f40f4b6ee2a06031
2022-03-23 17:31:24 +00:00
Lucas Silva
072d2beb83 [automerge] Update screen saver overlay toggle description 2p: 0f29d1562d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352044

Change-Id: I3c000b5d042373d8617f6648e4957dd7c57dd8f9
2022-03-23 17:31:18 +00:00
Lucas Silva
0f29d1562d Update screen saver overlay toggle description
Change-Id: I6baab768fd845211e0d0eaf98b6a59cff4e25832
2022-03-23 17:31:00 +00:00
Shivam Agrawal
8d6b19c0bf [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624 2p: 5178f33861
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: I013479e1be66fb21b3799a1966e7a09c5a7a0990
2022-03-23 16:34:23 +00:00
Shivam Agrawal
5178f33861 [automerge] Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings 2p: c39ddd2624
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Id63cfa4a0749f2471794046da1edf2cb0bd65a3d
2022-03-23 16:34:17 +00:00
Shivam Agrawal
c39ddd2624 Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings
It failed with Resources$NotFoundException and it blocks
WindowManager extensions CTS tests, so ignore it at first.

Bug: b/213322133 b/216630912
Test: atest com.android.settings.deviceinfo.PublicVolumeSettingsTest
Change-Id: I6827344b5316a4e57302bfc2e7ec4cf3674d6990
2022-03-23 12:31:28 -04:00
Yi Jiang
70128d9016 Moves battery saver warning message below Screen Attention setting.
Test:  make RunSettingsRoboTests -j40
Bug: 220252566
Change-Id: Ib51a0d73c13700c981d1ca789d2ab669e57d814d
2022-03-23 15:52:35 +00:00
Yuri Ufimtsev
1d52aa0072 [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089 2p: 8e7599c129
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Bug: 226105654
Change-Id: I1122bdd840f7874d28ec812e7e85189ece104d79
2022-03-23 15:47:10 +00:00
Yuri Ufimtsev
8e7599c129 [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Bug: 226105654
Change-Id: If1206914f684741e59e331f6d26a8fc5d7bfc528
2022-03-23 15:47:02 +00:00
Yuri Ufimtsev
af22553089 Postpone getting Metrics Category until it is needed
Test: manual

Bug: 226105654
Change-Id: I9473ddfd72e38bff4f93b43d539c467b2e13e258
2022-03-23 15:41:54 +00:00
Chaohui Wang
c22c9f0eb2 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451 am: ba394bec83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: I8ace1f8f19841f659dfaa8427023acbace4ea237
2022-03-23 13:49:24 +00:00
changbetty
dacce1fae3 Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT
Bug: 214338905
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
2022-03-23 13:38:46 +00:00
Chaohui Wang
ba394bec83 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: I49044c2b8fd210d20ed6437f9e1cad0e081644fd
2022-03-23 13:22:17 +00:00
Chaohui Wang
1ad2b83207 Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883

Change-Id: Ic1e2a5c85f2e7ebb2b78ff9dcabc359d4ae032f5
2022-03-23 13:22:12 +00:00
Chaohui Wang
8ba7ed6451 Merge "Fix SetupChooseLockPasswordTest" into tm-dev 2022-03-23 13:09:19 +00:00
Lais Andrade
68d7b91bb1 Add summary to "Vibration & haptics" settings
Use VIBRATE_ON main toggle to display on/off state as summary for
"Vibration & haptics" settings provider.

Fix: 220218654
Test: VibrationPreferenceControllerTest
Change-Id: Ifd4b9c7b1cb68ad0ea535091804a1e7f54297c44
2022-03-23 12:14:52 +00:00
jasonwshsu
4bfe215e4c Add link functionality in message of magnification triple-tap dialog
Bug: 210593079
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ShortcutPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationModePreferenceControllerTest
Change-Id: Id69b0b717410b5c5c44a818c36688bb7331c73ae
2022-03-23 19:44:33 +08:00
jasonwshsu
3b96a2c57e Apply new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode.
Root Cause: Original content in magnification switch shortcut dialog needs to have different versions for different accessibility software shortcuts. Use the generic content and new flow to replace it.

Solution: Apply new flow from UX suggestion.

Bug: 210593079
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationModePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityDialogUtilsTest
Change-Id: Id09b8847cca4fce1f3fb77770a03bff53ae05855
2022-03-23 19:43:03 +08:00
Chaohui Wang
1933ffacab Fix SetupChooseLockPasswordTest
Test fail is caused by method getVisibleScreenLockTypes() renamed to getVisibleAndEnabledScreenLockTypes() in
https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/14269154

Fix: 201021223
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password.SetupChooseLockPasswordTest"
Change-Id: Idcc7a9794217c1ef81ca4a26351e26773b18ccad
2022-03-23 17:19:21 +08:00
TreeHugger Robot
9547b59c96 Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8e8 am: e8334d9bb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: Ib9f2d513d48eafa014498a549c7dd26e6ed67014
2022-03-23 09:10:08 +00:00
TreeHugger Robot
e8334d9bb1 Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: I4bf75ada3b1291d0a457d424c82fd266f0a2949f
2022-03-23 08:47:53 +00:00
TreeHugger Robot
5068ff38b7 Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17335743

Change-Id: If7f7edcd139a5f9a651c9e089380643dcd2b3bdf
2022-03-23 08:47:35 +00:00
TreeHugger Robot
a12da0a8e8 Merge "Fix adding wifi configuration issue" into tm-dev 2022-03-23 08:27:47 +00:00
TreeHugger Robot
d31cf63d33 Merge "Add visibility control for the UiBlocker" into tm-dev am: a387297687 am: 2bba6ac214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119094

Change-Id: I59ba7efe945b31f7a3468146adf208b8b4fdb155
2022-03-23 08:27:34 +00:00
TreeHugger Robot
7dc9691d35 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73 am: 47f05534d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I7248a3bed62623afb1abc96476db23841227d617
2022-03-23 08:26:29 +00:00
TreeHugger Robot
2bba6ac214 Merge "Add visibility control for the UiBlocker" into tm-dev am: a387297687
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119094

Change-Id: Ie0493ba0da7865dcbc4fe9cd1b20e079664d7781
2022-03-23 08:18:35 +00:00
TreeHugger Robot
ca1bcca0d1 Merge "Add visibility control for the UiBlocker" into tm-dev am: a387297687
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119094

Change-Id: I307600f9bd7a719d3110471de247f5be00d91b75
2022-03-23 08:18:23 +00:00
TreeHugger Robot
a387297687 Merge "Add visibility control for the UiBlocker" into tm-dev 2022-03-23 08:14:46 +00:00
TreeHugger Robot
47f05534d2 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I3a4865ccc802fa80256965b080977bef9891e50c
2022-03-23 08:11:11 +00:00
TreeHugger Robot
5c1e297131 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev am: 764d7f4b73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321717

Change-Id: I2f3e5559c012457715257e5734121ae936f99782
2022-03-23 08:11:00 +00:00
TreeHugger Robot
764d7f4b73 Merge "Fix ConnectivityManager.requestNetwork crash issue when try again" into tm-dev 2022-03-23 08:00:05 +00:00
Calvin Pan
c117a89a53 Fix System language option missing and locale region missing issue
- Taking app package name into LocalePickerWithRegion
- Using toLanguageTag() instead of getLanguage() to prevent locale
 region missing

Bug: 226278910
Bug: 226280740
Change-Id: Ieac42616192065abc0cf82db023e4e50f1ca562d
Test: To be verified
2022-03-23 07:48:10 +00:00