Commit Graph

106902 Commits

Author SHA1 Message Date
Bill Yi
f0129ada03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours am: b8aa62dbea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff6952fcb7dab61d3eab327b3ac19ad8a305efc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:46:27 +00:00
Automerger Merge Worker
3227a73df6 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours" into tm-d1-dev-plus-aosp am: a20f785e3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id92b0d3ff35196b4c95d357387efe794ca1c52ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:45:03 +00:00
Bill Yi
db742301ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours am: 798cf379cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3dea9fd2d0d905f58f7f03837edfc8711848bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:44:30 +00:00
Automerger Merge Worker
5a8d9eacb1 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: eb43205dbf -s ours" into tm-qpr-dev-plus-aosp 2022-06-13 17:43:32 +00:00
Bill Yi
8775a1bde6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: fbf554e66e -s ours am: 46f045f411 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e580674d228696aabcecd2bc2a5b75993ef80bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:42:20 +00:00
Bill Yi
022a077d4e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours am: eb43205dbf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13e1e8390eca6731f4f98cd9975b20ea8e74e465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:42:06 +00:00
TreeHugger Robot
3ecbe9bc0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib80b1d4f968a8275bc8c92aede6c84f8aa7ab523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:32:34 +00:00
Bill Yi
ae5b4b8105 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe20bf626167e701d69bb9b57eb6fa1a42fb1270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:32:19 +00:00
Bill Yi
b0b7c615bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibfd46c1623530d3384f10c41bd4a19f4817a75e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:32:04 +00:00
Bill Yi
e42d87f108 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours am: 9af911315b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic07c8577b39334f06604902ef7fcb69b176463b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:23:12 +00:00
TreeHugger Robot
45f454ec8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28084562f39320be146fd8332b633aa375f43344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:20:41 +00:00
TreeHugger Robot
d956cbe32a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d6f2d6b1b3e99fb080c438a0cb5c83be1c4a47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:20:33 +00:00
Bill Yi
6693d73ef5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e2beaed53830562a4196d947b62afc5e2782804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:20:25 +00:00
Bill Yi
947e4e0ce8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5bd6f198943162cd76025f9d80e9fbb6f7699b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:20:17 +00:00
Bill Yi
b8aa62dbea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I013c6fb27657600426b7303ce20b460914bc65b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:20:09 +00:00
Bill Yi
14f91f0604 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09519681ced6997db295739bb967083ce56d44cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:20:02 +00:00
Bill Yi
eb43205dbf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d0d1106993015ada09e1f17d6eb90039ece8b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:18:09 +00:00
Bill Yi
c921642dde [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3141c81605ef7a72c49e33e64fdea27858a171bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:17:23 +00:00
Automerger Merge Worker
a20f785e3d Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours" into tm-d1-dev-plus-aosp 2022-06-13 17:16:26 +00:00
Bill Yi
9af911315b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2bc176b77fa12e7d2ee618c6aba5ced75fafb5e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:15:43 +00:00
Bill Yi
798cf379cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie09c58f20159e4c92bcab0971df8a52d3fe84413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:15:23 +00:00
Bill Yi
46f045f411 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: fbf554e66e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8cbaba18c3e0ecf45c81008d33726d239ee81ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:15:16 +00:00
TreeHugger Robot
7723c37234 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73937e9aef737e9d10eb725abe15efbe552c93f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:15:12 +00:00
Bill Yi
85d2a6c7b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic36f1744655068cce7bf729f26b8cba914bf2639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:14:58 +00:00
Bill Yi
d9fbc3319c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I054b90b7fde831108c85e053e8641ec6b3612561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:14:41 +00:00
TreeHugger Robot
e5a507e23c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I441cc35d147566377eb06f328905a44ea6649954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:05:07 +00:00
Bill Yi
04d01b2661 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I76566346fa6990130c77e736031ecbf4e40b2c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:04:55 +00:00
Bill Yi
362f3f6b6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0ff724718fbe1ab699152f1a6744015645d7051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:04:36 +00:00
Bill Yi
e8c0397e8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91096d91de1b1556306446a40455d093faec87b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:55:43 +00:00
Bill Yi
fbf554e66e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94c794e5c7065d881be7d7888f4223fd5fdf0491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:54:19 +00:00
TreeHugger Robot
acfcea73dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3d8b8de2be -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic81a305a14b67c6dee86c01adf22d39c3f8fe406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:53:50 +00:00
Bill Yi
c84af9d59e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a3ba24088 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6638f5c94ff915852ac60c896cc674ace9fd8294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:53:30 +00:00
Bill Yi
74c33f1900 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77b66b7495 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab06f8eeb6fbb083bf61c65fa088b65dfffa614a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 16:53:17 +00:00
TreeHugger Robot
3d8b8de2be Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-13 16:40:31 +00:00
TreeHugger Robot
8122edc9ac Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-13 16:40:03 +00:00
SongFerngWang
56e1297abe Unable to enable the removable esim
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
Merged-In: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-13 17:49:00 +08:00
SongFerngWang
887bb592c8 Reuse the active esim slot
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.

Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
Merged-In: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
2022-06-13 17:48:34 +08:00
SongFerngWang
faf9baf95b stop show preferred SIM card dialog during sim switch
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
Merged-In: I242402e49b267c8cd61a85a46367c778d2d8bbf8
2022-06-13 17:48:24 +08:00
Jason Chiu
ae1c17bd0f Add "smallestScreenSize" into homepage activities
The Settings home activity was initially launched in full-screen size,
and then resized in order to be displayed with another placeholder
activity size-by-side.

After ag/18668447, the smallest screen width dp configuration of the
activity was changed to half of the screen size (vs. the fullscreen
size) while embedding.

Therefore, the system updates the configuration changes using
CONFIG_SMALLEST_SCREEN_SIZE, which the Settings home activities didn't
declared. This makes Settings show the full-screen home layout in
dual-pane mode.

Fix: 235449822
Test: visual, robotest
Change-Id: I801ff5fb20b2a42c94223a6edd4af08b67e7f4e9
2022-06-13 06:44:22 +00:00
Bill Yi
7b831dc400 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie29078a0f8a50a373604db8dbd4fd2272426add7
2022-06-11 13:26:42 -07:00
Bill Yi
3a3ba24088 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I417d9be4714e60a9e7a36c56e7bd9c8fbb620a89
2022-06-11 13:22:08 -07:00
Bill Yi
e006e9823d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I81a6f90e03513ab441888db3316d4b612b3a72ca
2022-06-11 13:17:41 -07:00
Bill Yi
77b66b7495 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id13eb722fe69d4c571cfa68c8fe1fa729e218a38
2022-06-11 13:07:25 -07:00
Bill Yi
154b913f4b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9332ed519d4fb2a15ad3ba9fcfea68d9ab657ff8
2022-06-10 21:47:08 -07:00
Bill Yi
f5cfec7f75 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6e5a4af5147a8e1cdebd5049ad5941ce51442553
2022-06-10 21:43:26 -07:00
TreeHugger Robot
ae6f2b0e94 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 45580a02a4 am: 4ab4d68f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: I37991dc27e8b3cdf0de9073cffba1d1999ceacde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 22:07:59 +00:00
TreeHugger Robot
b27106a131 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c am: 4091170456
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: I35907ff13a355fb36cb7ba520d9c366967d37e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 22:07:27 +00:00
TreeHugger Robot
9aa37e4434 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c am: 5f50ce04f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: If0c6ecb6ae28407e3f8e975ecc992b7581773454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 22:05:21 +00:00
TreeHugger Robot
4ab4d68f60 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 45580a02a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: Id674f125687fc60af9359a95b2852cbbc33d4a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 21:32:24 +00:00
TreeHugger Robot
4091170456 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: Iaa080b1ba55ad24a174edb5907a5b3fe7dd78584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 21:31:32 +00:00