Commit Graph

90494 Commits

Author SHA1 Message Date
Bonian Chen
7f348f2ba9 Merge "[Settings] Expand the display area of PIN error message" 2021-12-22 04:08:18 +00:00
TreeHugger Robot
43b16debdb [automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c -s ours am: 634a94b899 -s ours
am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb540 is already in history

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

Change-Id: Ie79749d487851c5f5a8709b4bc74aa899cf4e620
2021-12-22 03:57:54 +00:00
TreeHugger Robot
dff1a9b055 [automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c -s ours am: 634a94b899 -s ours
am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb540 is already in history

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

Change-Id: Ib89e1bcdc67b6da4665db70d4940605106a7ab58
2021-12-22 03:57:51 +00:00
TreeHugger Robot
634a94b899 [automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c -s ours
am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb540 is already in history

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

Change-Id: I3cd73f0e78e5c00e1680e3f335e7f9fc3ce98c56
2021-12-22 03:43:31 +00:00
Automerger Merge Worker
e0ddd60bdc Merge "[automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d -s ours am: 1c0b3b0a7d -s ours am: 9c48278be2 -s ours" into sc-v2-dev-plus-aosp 2021-12-22 03:42:02 +00:00
TreeHugger Robot
6aea2261b1 [automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d -s ours am: 1c0b3b0a7d -s ours am: 9c48278be2 -s ours
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03 is already in history

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

Change-Id: Id5670e6169667ea89300e022861127235ea320b3
2021-12-22 03:41:58 +00:00
TreeHugger Robot
4bca9628d4 [automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d -s ours am: 1c0b3b0a7d -s ours am: 02e50b1caf -s ours
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03 is already in history

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

Change-Id: If63616b8ec35fdf16b7ccfa7d7c88c96ba06a138
2021-12-22 03:41:53 +00:00
TreeHugger Robot
15afdd803c Merge "Fix USB tether option" into sc-dev 2021-12-22 03:27:13 +00:00
TreeHugger Robot
02e50b1caf [automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d -s ours am: 1c0b3b0a7d -s ours
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03 is already in history

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

Change-Id: Ibace7dcd9903a97629354e3e66673e57edf6be7a
2021-12-22 03:18:22 +00:00
TreeHugger Robot
9c48278be2 [automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d -s ours am: 1c0b3b0a7d -s ours
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03 is already in history

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

Change-Id: Ifa599d179bac0ebee866d06eea7290176847f780
2021-12-22 03:18:21 +00:00
TreeHugger Robot
1c0b3b0a7d [automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d -s ours
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03 is already in history

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

Change-Id: Ic18aa6cfebdca3cc0e333f29f0a8a1e07270dcf0
2021-12-22 03:00:30 +00:00
TreeHugger Robot
da8ab6a51d Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev 2021-12-22 02:43:04 +00:00
Stanley Wang
446f6dd886 Restore the style of the screen saver widget from switch style to
button style.

The operation of the Switch is not suitable for previewing the
screen saver and will make the user confused. So we change the
style of the screen saver widget back to the button style.

Fix: 189505023
Test: manually test the screen saver
Change-Id: I4a97d91cc0b76111d4cb7b6aa202f2207ee0ca5d
2021-12-22 10:13:27 +08:00
Xin Li
bf2e17f4b9 [automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3 am: 3be43ae165 -s ours am: 45c581df53 -s ours
am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224 is already in history

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

Change-Id: I664100f166a7dadf818f19c71f0c9cd593a8f757
2021-12-21 07:36:38 +00:00
Xin Li
45c581df53 [automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3 am: 3be43ae165 -s ours
am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224 is already in history

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

Change-Id: I6fc2e4a1c103c7efad592eb468a441795c267e07
2021-12-21 07:20:47 +00:00
Bonian Chen
48c945e9b5 [Settings] Expand the display area of PIN error message
PIN error message when user operating on PIN lock got long text string.
Which not fit into 2 lines of display area.

This is a change to expand the display area to max. capacity but remain
tightly wrap the text.

Bug: 211176734
Test: local
Change-Id: If175a53de4646d2479b15b10f6b59e4e0870d521
2021-12-21 14:08:58 +08:00
Xin Li
3be43ae165 Merge "Merge SP1A.211205.008" am: 0bf1802bb3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705

Change-Id: I8ce5af67e19d864ad3951c15252b0c3496fd56d0
2021-12-21 05:21:38 +00:00
Xin Li
0bf1802bb3 Merge "Merge SP1A.211205.008" 2021-12-21 05:02:44 +00:00
Xin Li
971abb190b Merge SP1A.211205.008
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
2021-12-20 14:15:09 -08:00
Linus Tufvesson
553ca3e58d Make WifiDppEnrolleeActivity launches explicit
Bug: 180518134
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppUtilsTest\|WifiDialogActivityTest
Test: Manually verified b/180518134 attack is no longer possible

Change-Id: I8c4e1e17117582c78671d0e4658bd87715a9a046
(cherry picked from commit 59c0a7bc63)
2021-12-20 15:21:25 +00:00
William Escande
23ebda4c12 Add QUERY_AUDIO_STATE permission
This permission is added to getLastAudibleStream
Bug: 190422401
Tag: #refactor
Test: Build + start a2dp + play music + change volume from DUT/speaker

Change-Id: I65c5e6f50e7b440af57b2a0bd6656db91446578b
2021-12-20 13:45:47 +01:00
Treehugger Robot
ae62873812 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92 am: 9713bec956
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I2c7e0aeb425596f168a08f7c7bec653f5244e12e
2021-12-20 03:44:54 +00:00
Treehugger Robot
9713bec956 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I8501963b7bd636b08107a1acd1495e74b355fea4
2021-12-20 03:31:28 +00:00
Treehugger Robot
9c2293ca92 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: Ic05e38726cd2f42e919553a11eb0ce6944ce0d20
2021-12-20 03:14:04 +00:00
Treehugger Robot
a3d97ecd74 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" 2021-12-20 02:53:33 +00:00
Alice Kuo
27a0274d6e Add test case - forceUpdate_deviceIsSubDevice_doNothing
Bug: 201472540
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: I1aef6429b39109a09931a94b61f15e9470de3854
2021-12-20 01:35:40 +00:00
Bonian Chen
c66bc49fde [Settings] Enable WiFi calling toggle in search am: a93796f7a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16486544

Change-Id: I4977409c4016ab4eb40806a139a5870c425e9f19
2021-12-16 18:33:46 +00:00
Bonian Chen
a93796f7a3 [Settings] Enable WiFi calling toggle in search
WiFi calling toggle in search need to pass the toggle request to
receiver to make it work.

Bug: 206871758
Test: local
Change-Id: If23d1ae1eaeb5d505e584dec94e1980f6e329c65
(cherry picked from commit a6a35b8409)
2021-12-16 12:18:50 +00:00
Zoey Chen
baa1b112fd [RESTRICT AUTOMERGE] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5 am: a582bb1092
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16475181

Change-Id: I153cee7c647997e9ccec066075af5e1bacd7fb86
2021-12-16 09:01:48 +00:00
Zoey Chen
a582bb1092 [RESTRICT AUTOMERGE] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5
Test: atest MobileNetworkSummaryControllerTest, NetworkProviderWifiCallingGroupTest, NetworkProviderBackupCallingGroupTest
Bug: 197066557
Change-Id: I829590bfa37ee2166d9388ccad35d306b201f844
2021-12-15 15:58:29 +00:00
Alex Johnston
6a8cbc9fac Fix USB tether option
* USB tether option will be grayed out before
  USB cable is plugged in.

Bug: 192225597
Test: manual testing
Change-Id: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
Merged-In: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
(cherry picked from commit 685cacb540)
2021-12-15 13:57:04 +00:00
Zoey Chen
c4d1fc4fd2 [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.4 am: ad79a1819f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16475177

Change-Id: Ie593095306f72abfbe3962994e117a084b00c853
2021-12-15 13:50:21 +00:00
Zoey Chen
ad79a1819f [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.4
Test: atest NetworkDashboardFragmentTest
Bug: 197066557
Change-Id: I9781af3a53fe7050b414f0574abb7618f8d71707
2021-12-15 10:19:49 +00:00
Treehugger Robot
16a3f98b71 Merge "Settings: Extend the data role swap timeout value" am: bb994f627f am: df2a22f104 am: 26bf610fd9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875

Change-Id: I86be84ebc20266fb0b6af1b2faa196def582da55
2021-12-15 07:35:30 +00:00
Treehugger Robot
26bf610fd9 Merge "Settings: Extend the data role swap timeout value" am: bb994f627f am: df2a22f104
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875

Change-Id: I0d456509b02715b141a6110ef89a476995ce5d67
2021-12-15 07:23:26 +00:00
Treehugger Robot
df2a22f104 Merge "Settings: Extend the data role swap timeout value" am: bb994f627f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875

Change-Id: I42a32278a74fd99f6f397c2c9d489f4bd94b3dc0
2021-12-15 07:06:33 +00:00
Treehugger Robot
bb994f627f Merge "Settings: Extend the data role swap timeout value" 2021-12-15 06:49:44 +00:00
Jason Hsu
f6f978ec38 Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev am: 4ae25ef592
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16464242

Change-Id: Ie87bc598fbba95ef042b3be813801a437adeace3
2021-12-15 06:23:47 +00:00
Jason Hsu
4ae25ef592 Merge "Revert "Add new string to hint user of triple-tap shortcut delay"" into sc-v2-dev 2021-12-15 06:11:18 +00:00
Xin Li
539e62512b [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours am: 54916e10e8 -s ours
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

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

Change-Id: I39022c9f6e91c2722d2f78e8f19da0cd96488532
2021-12-14 21:51:00 +00:00
Xin Li
54916e10e8 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours am: 50d6b616d7 -s ours
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

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

Change-Id: I5eeeaca9b47404dafc838583ff60cabf80184161
2021-12-14 21:24:07 +00:00
Xin Li
50d6b616d7 [automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11 -s ours
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8 is already in history

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

Change-Id: I14e4d4bad0bf56de1031170010143763bcb4300d
2021-12-14 21:00:16 +00:00
Xin Li
798e3d7d11 Merge "Merge Android 12 QPR1" 2021-12-14 20:26:01 +00:00
Xin Li
475d27801f Merge Android 12 QPR1
Bug: 210511427
Merged-In: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
Change-Id: I750e1a1f03c22a58637ff65825756d849ab089b5
2021-12-14 08:39:13 -08:00
Jason Hsu
8eb2aeafa4 Revert "Add new string to hint user of triple-tap shortcut delay"
This reverts commit dc156e77b4.

Reason for revert: New flow for magnification switch shortcut need to be fine-tuned again. Punt this flow to Android T, so revert the string.

Change-Id: Ieb48b8e3e34b96130193cf8499ff8f49e5954b1f
2021-12-14 09:39:01 +00:00
Bonian Chen
29863c9d8d Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8 am: 718c17039e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: I8a84ff16006d462a0afef993132bfb081eff1537
2021-12-14 02:53:55 +00:00
Bonian Chen
6418f1822d Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54 am: 2bed540284
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: I52e8fc8a2ec4529d94b36d9a7d4697d82d88b118
2021-12-14 02:53:53 +00:00
Bonian Chen
718c17039e Merge "[Settings] Fix failure test case" am: 57a7978f8c am: 54ee717db8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: I2da154061359ad72ffa736873f06052be93ed721
2021-12-14 02:46:06 +00:00
Bonian Chen
2bed540284 Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc am: 54e4845d54
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791

Change-Id: Icba1cb39911ec1e06b3952117e95ccf03630aeae
2021-12-14 02:46:04 +00:00
SongFerng Wang
81d58df274 Merge "To disable the preferred network mode UI during calling." am: 9dec28892c am: a74e6cd2ec am: 38a109d745
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331

Change-Id: Ie25bb9a2faee5e4ed58591e903778e3db21ef838
2021-12-14 02:44:15 +00:00