TreeHugger Robot
131de319c0
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-12-23 18:20:15 +00:00
TreeHugger Robot
1f5c8ea55d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-12-23 18:20:13 +00:00
TreeHugger Robot
c22a52aac3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-23 18:19:58 +00:00
TreeHugger Robot
71ae518c88
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-23 18:19:57 +00:00
TreeHugger Robot
de8493a8ee
Merge "Make WifiDppEnrolleeActivity launches explicit" into sc-v2-dev am: b94ae9ffb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16509324
Change-Id: I85beb9352125aaa74df850853b81a1f9f82b24d0
2021-12-22 19:19:14 +00:00
TreeHugger Robot
b94ae9ffb3
Merge "Make WifiDppEnrolleeActivity launches explicit" into sc-v2-dev
2021-12-22 18:43:39 +00:00
Bill Yi
ae3198be93
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I990751fa47191c170d7def2a005f94e688f2e7c5
2021-12-22 17:47:24 +00:00
Bill Yi
778c36e32e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8615103b5a4df25008ca6ee5d3d5991a6ade0d1d
2021-12-22 17:43:28 +00:00
Bill Yi
4948c670f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib5db99d68b52f343bdc999deb666780690faec52
2021-12-22 17:39:39 +00:00
Bill Yi
296eed7cba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib857a627605813328a0417897a4043923463e2ba
2021-12-22 17:32:06 +00:00
Bill Yi
bd0b96b416
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2b61f14067ea07e12fa8bdd3f88e15e9eb39dca5
2021-12-22 17:30:18 +00:00
Bill Yi
d271043a53
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I818be87c0115b75678e405d76dcd261251422473
2021-12-22 17:28:35 +00:00
Stanley Wang
0bac54a0ee
Merge "Restore the style of the screen saver widget from switch style to button style." into sc-v2-dev am: bfd37d65b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16512667
Change-Id: I1eb6e46632e7486bfe79cada099059e333c3906b
2021-12-22 08:59:39 +00:00
Stanley Wang
bfd37d65b0
Merge "Restore the style of the screen saver widget from switch style to button style." into sc-v2-dev
2021-12-22 08:36:26 +00:00
Bonian Chen
703e5395b4
Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9
am: d692413d83
am: 59e07d18f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382
Change-Id: Icdf894324be99a0582446c1c45cd548f7b2eaf72
2021-12-22 05:19:32 +00:00
Bonian Chen
59e07d18f3
Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9
am: d692413d83
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382
Change-Id: I55f18581b7980da472dbbd20f843fcc03a27ea72
2021-12-22 05:03:45 +00:00
Bonian Chen
d692413d83
Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382
Change-Id: I89ab03dd12306cbcdf1460c9c940253ba0c2b67b
2021-12-22 04:27:08 +00:00
TreeHugger Robot
8d538dc90c
[automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c
-s ours am: 634a94b899
-s ours am: dff1a9b055
-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: If28923973da1a4726cae46f6fb0ff7050c7e5471
2021-12-22 04:14:21 +00:00
TreeHugger Robot
f189bfcce5
[automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c
-s ours am: 634a94b899
-s ours am: 43b16debdb
-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: Ia581224bcc2b4efed3d2ec475a653194c9b30292
2021-12-22 04:13:46 +00:00
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