Commit Graph

99768 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
dde94af526 Snap for 8023588 from ce1f8fdb08 to tm-release
Change-Id: Ie26b789eacb60f9d4438464f5529f572b0b06b42
2021-12-23 02:09:14 +00:00
changbetty
efd5d04ab1 To disable Wi-Fi tethering when user restriction is set
Bug: 203168953
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Change-Id: I749de121c3918382bf03e437e683477bac23cae1
2021-12-23 02:08:44 +00:00
TreeHugger Robot
ce1f8fdb08 Merge "Make WifiDppEnrolleeActivity launches explicit" into sc-v2-dev am: b94ae9ffb3 am: de8493a8ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16509324

Change-Id: I9d63e4dd72b2e0198ab1178fb765bba2361df664
2021-12-22 19:32:09 +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
Patrick Huang
2dc486bd62 Merge "Add config for showing/hiding emergency setting entry" 2021-12-22 18:32:31 +00:00
Tomasz Wasilczyk
00e29015f9 Don't crash Network settings if Wi-Fi is not supported.
Bug: 209906859
Test: flash & boot wifi-less device
Change-Id: If212e7a667e60812c14ece9ef4386de0efb606c2
2021-12-22 10:00:44 -08: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
8ca6fcd384 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If72ca8dbe5b6f5936c389b8e5607e20101e2eaf8
2021-12-22 17:35:42 +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
Bill Yi
f25944241e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I92211aa4ba463e494958c0df4745252dfba741ac
2021-12-22 17:26:54 +00:00
Bill Yi
eba995750f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id331047c326264b57397357e50d398f222737836
2021-12-22 17:23:55 +00:00
Bill Yi
6d67586268 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1ead3d51a1
Blank merge reason: commit message contains skip directive

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

Change-Id: I640289df076bd30f12146e814d6a09836bb0dc4c
2021-12-22 17:20:25 +00:00
Bill Yi
1ead3d51a1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If163e049edb23be7b3c35d47ba88e088ad74f6f7
2021-12-22 17:20:05 +00:00
SongFerngWang
e28eaa725d [MEP] Use switchToSub API with pending intent
It is based on the framework refactor. ag/16494924  Framework
changed the API, so here modifies it.

Bug: 205504646
Test: WIP manual
Change-Id: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
2021-12-23 00:09:21 +08:00
SongFerngWang
bf148dea7c [MEP] disable enabled esim profile before set simSlotMapping
This is the modem request to disable enabled esim profile before
set simSlotMapping.
Since the framework still do API refactor ag/16494924. The
switchToSub API will be changed, so here modify two callback.
the one of callback will be removed after the framework complete
the API refactor.

Bug: 210063749
Test: Build pass. Local test: do sim switch in SS mode and DSDS mode.
Change-Id: Iee650897b81c96b5febb0413649629b1a1971b18
2021-12-23 00:04:08 +08:00
Stanley Wang
8cfc57f258 Merge "Restore the style of the screen saver widget from switch style to button style." into sc-v2-dev am: bfd37d65b0 am: 0bac54a0ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16512667

Change-Id: I6403aec4c28473abd027bf11f977051f008bb414
2021-12-22 09:18:00 +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
c9cc82181c Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9 am: d692413d83 am: 59e07d18f3 am: 703e5395b4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382

Change-Id: I2fff5b5c56d219a171dfadcfbdf9b0f6c579f690
2021-12-22 05:39:00 +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
TreeHugger Robot
f693b1ec8e [automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c -s ours am: 634a94b899 -s ours am: dff1a9b055 -s ours am: 8d538dc90c -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: Iafb1a5a656091fa568d882e1613f4bfd6e1d093d
2021-12-22 04:31:57 +00:00
TreeHugger Robot
1ab9e9395d [automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c -s ours am: 634a94b899 -s ours am: 43b16debdb -s ours am: f189bfcce5 -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: Ida585eac0d50f2bc6392f5ff1c38c302ccbd193e
2021-12-22 04:31:47 +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
Automerger Merge Worker
430392f772 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 am: e0ddd60bdc -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: I0643a3d7acc37716d0e2187d5ef23559235dda99
2021-12-22 03:56:55 +00:00
Automerger Merge Worker
f6b240f247 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: 02e50b1caf -s ours am: 4bca9628d4 -s ours" 2021-12-22 03:56:48 +00:00
TreeHugger Robot
ecd2959ab8 [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: 4bca9628d4 -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: I2d62d1a1e871b31ccec03173ba0dc7f338eb4fd9
2021-12-22 03:56:43 +00:00
TreeHugger Robot
abcd40dde7 [automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c am: c98f700d79 -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: I192b7f1fb1c783917f6490d9ee9ee768c739e5ae
2021-12-22 03:56:41 +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
TreeHugger Robot
c98f700d79 Merge "Fix USB tether option" into sc-dev am: 15afdd803c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16476806

Change-Id: Id7e0710939954f4dd7a89df8d09420abdc96c2c4
2021-12-22 03:42:47 +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
784223d0e3 [automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d am: 8c799744a3 -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: I069905bbf4d459eddb22c845bbb8f4a766e00a7f
2021-12-22 03:18:14 +00:00
TreeHugger Robot
8c799744a3 Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723689

Change-Id: I0b2458d050882d10c7aa6820e762f69612bf5004
2021-12-22 03:01:12 +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