Commit Graph

93011 Commits

Author SHA1 Message Date
Bill Yi
7d111e9b0b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours am: bf4b93129f -s ours am: 6306ac8576 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1adee1a3c2e7a93eb229ed2ba02548d849afb787
2021-07-12 07:45:30 +00:00
Bill Yi
2fe6e382d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2091d9fbae8ee41c013401190e11c877c7fba447
2021-07-12 07:41:29 +00:00
Bill Yi
96d0cdbea1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours am: bf4b93129f -s ours am: b91ee37910 -s ours am: c39d80b389 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7107bf90b1ca47f684c01337ea4de5c41819640b
2021-07-12 07:35:09 +00:00
Bill Yi
c39d80b389 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours am: bf4b93129f -s ours am: b91ee37910 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I646d2946ab9f8a631055c25a305fb2b63e131b0d
2021-07-12 07:31:28 +00:00
Bill Yi
d9ed7ca8d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80 -s ours am: e6458604bd -s ours am: b37b5816c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id45011a15a8e3f3f47afa4b3d8c803b9e9fc0202
2021-07-12 07:31:04 +00:00
Bill Yi
ff9137ab66 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80 -s ours am: 576bd3da5b -s ours am: 62ce19b6ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19369ff1cdecf3c6eafb137c0c0f7f2008d39393
2021-07-12 07:30:38 +00:00
Bill Yi
56d7332b90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours am: bf4b93129f -s ours am: f9116afdf5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86ab7cd6b4f3a7f2fdaef7749979f1c485daed87
2021-07-12 07:30:28 +00:00
Bill Yi
6306ac8576 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours am: bf4b93129f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79d034b4a1c2f1e6e316dbb7e29b1f88895f0725
2021-07-12 07:16:29 +00:00
Bill Yi
f9116afdf5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours am: bf4b93129f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d193d027c16067fdf8b569110c74dbd016a0c2b
2021-07-12 07:15:47 +00:00
Bill Yi
b91ee37910 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours am: bf4b93129f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42240b4866647a6430aa32aacc6175b36d7be4c2
2021-07-12 07:15:24 +00:00
Bill Yi
b37b5816c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80 -s ours am: e6458604bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe2452a826c1a3e8e4bb06297345eb76b17140af
2021-07-12 07:11:13 +00:00
Bill Yi
62ce19b6ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80 -s ours am: 576bd3da5b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad0936daa035fff8cd5bf8ee17f68dbd97b08daa
2021-07-12 07:10:48 +00:00
TreeHugger Robot
6a2498ba06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 06facc35cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08671fae893bda28139e5fb0a86a493bda71121e
2021-07-12 07:10:29 +00:00
Bill Yi
b29bd2ea90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80 -s ours am: a48977aee1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc86db50efe7eb524d56c1598099067095603e00
2021-07-12 07:10:20 +00:00
Bill Yi
199e74592e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3343dcb23 -s ours am: 86f723c3a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia762c08db9cbc763ebb51b4fe0aed42bcde2a4ec
2021-07-12 07:05:05 +00:00
Bill Yi
bf4b93129f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I877fc8715242c4056cdf45a955bbc5f8cf68b93a
2021-07-12 07:00:51 +00:00
Bonian Chen
0726f263a8 [Settings] Rollback group UUID merging in SIM settings
Within origin design, subscriptions with same group UUID
are not merged together.

This is a fix which changing grouping by UUID part into a configurable
option which allows to be enabled in some other conditions.

Bug: 191228344
Test: local
Change-Id: I0101f4a51ec2342f059762f0e7d38bb4e93554cf
2021-07-12 14:59:28 +08:00
TreeHugger Robot
06facc35cf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-12 06:57:13 +00:00
Bill Yi
576bd3da5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib982cdb72d570f0f52402726497ab1f24eb258be
2021-07-12 06:56:48 +00:00
Bill Yi
a48977aee1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e65ed96b1b558c86934c6d90594f31d7199d238
2021-07-12 06:55:54 +00:00
Bill Yi
e6458604bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f360fb7f80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6ab20ff1121080219c04e13caa9208e4d23b005
2021-07-12 06:55:49 +00:00
Bill Yi
86f723c3a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3343dcb23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50594e47875e9d7d48f84738e44dad03f7432dd3
2021-07-12 06:48:45 +00:00
Bill Yi
2c5d2dfc74 Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I2b0706fc636af827e9a7f76ca00c99653d569dbf
Change-Id: I47f15d872a0adcafe26fa349b3d0ecdcdc061872
2021-07-11 22:43:41 -07:00
Bill Yi
e3343dcb23 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I18a4de23bbd4151ba9b9bba1b74867667a108f8f
2021-07-12 01:26:09 +00:00
Bill Yi
f360fb7f80 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95d60c69d8b002a5714a5ec18f0cf3026e10ab60
2021-07-12 01:22:27 +00:00
Bill Yi
a54853c370 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8c13a26cab7ced9bf9f3e4938557830cdc4c53ee
2021-07-12 01:18:24 +00:00
Bill Yi
ea3600ce39 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I85d570cd2d2c9e6f80672d0692ad385ffa2b3a89
2021-07-12 01:08:49 +00:00
Bill Yi
fc4e91569b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0d67ba9fa6d73187fdb02387c9baa3c60da43da4
2021-07-12 01:01:09 +00:00
Bill Yi
8dfc6a13ba Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3c71882147ae08775b5dbc074e91bd1df6eb33b6
2021-07-12 00:57:20 +00:00
Bill Yi
78b9116bad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36 -s ours am: 7639158022 -s ours am: fae45f9d6a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26f3e95088d842a86409ff27bcac775c9820630b
2021-07-11 02:37:25 +00:00
Bill Yi
9751031ef4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36 -s ours am: 7fd60a16b9 -s ours am: b872835f45 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69673caf82e92b09f4d1e046e112753cd3f3342c
2021-07-11 02:36:57 +00:00
Bill Yi
fae45f9d6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36 -s ours am: 7639158022 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id81247df687606a95c07a60aae8f1c3731dd5185
2021-07-11 02:25:50 +00:00
Bill Yi
b872835f45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36 -s ours am: 7fd60a16b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1b4d0432e1240eda49e36f39d5f0e135c843a34e
2021-07-11 02:25:21 +00:00
Bill Yi
4155df026c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36 -s ours am: 37c7ac096c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If0863646800e1f1481f3f703bb4bf3e313a125bf
2021-07-11 02:24:51 +00:00
Bill Yi
7fd60a16b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69c704baa1d3303129b8387616e2113debd0a69a
2021-07-11 02:10:33 +00:00
Bill Yi
37c7ac096c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a42f33a7d97c2aaded6a258c8e921cb1b4e74c1
2021-07-11 02:09:45 +00:00
Bill Yi
7639158022 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80494f3b36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b0706fc636af827e9a7f76ca00c99653d569dbf
2021-07-11 02:09:43 +00:00
Bill Yi
80494f3b36 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9743e34ecaaec254b43ced73ad24c93a917dbe6d
2021-07-10 23:13:40 +00:00
TreeHugger Robot
fbb98b8cf0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231 -s ours am: 2784c41cd8 -s ours am: 0c5c81202a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28002de0f948b3fd62577709b77682c6f952f672
2021-07-10 02:42:32 +00:00
TreeHugger Robot
5d7010fb73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231 -s ours am: a5beea5849 -s ours am: c088c11bba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I189b072321cd536fee3c4f698708d8e064c432d4
2021-07-10 02:41:59 +00:00
TreeHugger Robot
0c5c81202a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231 -s ours am: 2784c41cd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2ae4ad5e4d2ea8333ddc364a63c33b12ec8786b
2021-07-10 02:30:47 +00:00
TreeHugger Robot
c088c11bba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231 -s ours am: a5beea5849 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c379c94928f188810d837b836f464cb94853ca5
2021-07-10 02:30:25 +00:00
TreeHugger Robot
d92810777d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231 -s ours am: d7a21b370c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2e3ca33fd45c9e61bec3aaf5c46e084431d3b88
2021-07-10 02:29:57 +00:00
TreeHugger Robot
a5beea5849 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idbe2b5118eb6e9ebf27706b36f612136a514427d
2021-07-10 02:15:34 +00:00
TreeHugger Robot
2784c41cd8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1391e3c92d403f0b26aa5c385cd2d4ece29e87ad
2021-07-10 02:14:49 +00:00
TreeHugger Robot
d7a21b370c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0543cd0231 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a1f411b2fe78731f1ca8cd4794b5e18cf007941
2021-07-10 02:14:45 +00:00
TreeHugger Robot
0543cd0231 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-10 02:01:32 +00:00
Bill Yi
becb6d091c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iac93f20d863db9b7ec8335150421940c3724dc5f
2021-07-10 00:14:00 +00:00
Meng Wang
752013af68 Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 am: eef4b8fd1a am: 9bdbc8c4b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: I6cd030eb9faa526398f252351dede53d3e2437dd
2021-07-09 23:11:02 +00:00
Meng Wang
a5862bdb48 Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 am: 3e5b063766 am: f91d19ae7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: I44126d92ec42fa2f8931a53fe088a0520317ce71
2021-07-09 23:10:55 +00:00