Commit Graph

99816 Commits

Author SHA1 Message Date
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
cf192bdfa6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-12-23 18:17:14 +00:00
TreeHugger Robot
722e3e110d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-23 18:17:06 +00:00
TreeHugger Robot
effd2871c7 Merge changes from topic "presubmit-am-587ad354e0934977a11ff5786601e88f"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1ead3d51a1
  Import translations. DO NOT MERGE ANYWHERE
2021-12-23 18:17:06 +00:00
Evan Chen
ca2d21416d Update bluetooth setting for AssociationInfo
Bug: 205738945
Test: Manually test
Change-Id: Id46b2632abe7b44fe8d0538a4b58e273c913c889
2021-12-23 17:52:01 +00:00
Yomna Nasser
c17bef1711 Merge "Update "Allow 2G" toggle summary wording." 2021-12-23 15:43:05 +00:00
Zoey Chen
8349ee6a7b [Settings] Should back to previous page when removing the SIM (subinfo is null)
Test: atest
Bug: 211843783
Change-Id: I5fc2ecdf26848af246baab42a11c239a7aa82ee1
2021-12-23 13:29:37 +00:00
tom hsu
4da192d732 [Panlingual] Remove getCallingPackage and use Uri instead.
- Use uri to pass the package name.
 - Allow adb command to start this function

Bug: 211856852
Test: see b/211856852#2

Change-Id: I3d73d32d7546bf0e3db25d952b2caee934f523dc
2021-12-23 13:00:28 +00:00
TreeHugger Robot
11070ba729 Merge "[Settings] Can not launch SIMs page correctly" 2021-12-23 11:07:24 +00:00
Yuri Ufimtsev
4eea126959 Group some Security settings to a separate "Advanced settings" screen
Test: adb shell am start -a android.settings.SECURITY_SETTINGS opens Advanced
Security Settings screen
Test: atest SettingsUnitTests:SecurityAdvancedSettingsTest
Test: atest SettingsUnitTests:SecurityAdvancedSettingsControllerTest

Bug: 204416998

Change-Id: If9c6da812ffb7c046b3b00a084007950801e1d4f
2021-12-23 10:26:46 +00:00
Zoey Chen
0d89c09b3f [Settings] Can not launch SIMs page correctly
The subId should be set from argument when launching MobileNetworkSettings by new SubSettings

Test: atest
Bug: 211843783
Change-Id: Ie2b675af278795930971c61d8b1c1c28b96bf0ee
2021-12-23 09:30:11 +00:00
SongFerng Wang
dcc1ee42c3 Merge "[MEP] disable enabled esim profile before set simSlotMapping" 2021-12-23 09:20:02 +00:00
Betty Chang
8bf6efba9e Merge "To disable Wi-Fi tethering when user restriction is set" 2021-12-23 07:58:48 +00:00
Yomna Nasser
91036f8945 Update "Allow 2G" toggle summary wording.
Update "Allow 2G" toggle summary wording to be more clear regarding
the purpose of the toggle and why it may be disabled.

Bug: b/193693810
Bug: b/196183458
Test: manual & atest -c Enable2gPreferenceControllerTest
Change-Id: Iffef8f4f44105de30392c30ffd44c1d62cd066b8
2021-12-23 07:11:36 +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