PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,298 Commits 1 Branch 0 Tags
cb3a1940a61f11f28f384fef9f06ac62c2f6ae3c
Commit Graph

93298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Meng Wang
9bdbc8c4b7 Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 am: eef4b8fd1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

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

Change-Id: I6f9759680f39f8b5661c9867339e613c2159d296
 2021-07-09 23:00:37 +00:00
Meng Wang
744c9ec231 Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 am: b92327498b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

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

Change-Id: I5c13502898e86af3a39854b77e8b2a856b0139e9
 2021-07-09 22:45:02 +00:00
Meng Wang
b92327498b Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: Idde13d6b4331e422967d99610912c5cec323cf33
 2021-07-09 22:44:10 +00:00
Meng Wang
eef4b8fd1a Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: If9feedd87413eff719bb695791e52bda4f5a7263
 2021-07-09 22:44:07 +00:00
Meng Wang
d43986fa96 Merge "Refine WFC location notice text." into sc-dev 2021-07-09 22:30:44 +00:00
SongFerng Wang
2cf65c11ab Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba am: f407616398 am: 8f164fa3a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851

Change-Id: I21d73ddb5ad4bbb865d547e1a0c2606136022506
 2021-07-09 18:30:48 +00:00
SongFerng Wang
0b00fbc343 Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba am: fd3e430c52 am: 048b174024 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851

Change-Id: Icc6f8ca1a201abe61b9c8844614d3202588ac35a
 2021-07-09 18:30:31 +00:00
SongFerng Wang
8f164fa3a6 Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba am: f407616398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851

Change-Id: I3ab5e170dfd23f4fe6bbb9679a5f39ae593b3311
 2021-07-09 18:15:10 +00:00
SongFerng Wang
048b174024 Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba am: fd3e430c52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851

Change-Id: I93423015c63dab201502fca8872b5e6d6c37faeb
 2021-07-09 18:14:40 +00:00
SongFerng Wang
84a23c59f1 Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba am: b360e1aec3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851

Change-Id: I510081de84fc3ec138112d6c8140670aac119247
 2021-07-09 18:14:14 +00:00
SongFerng Wang
fd3e430c52 Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851

Change-Id: If41e1fba7f40d06f31707fb5c8692accad580767
 2021-07-09 18:00:58 +00:00
SongFerng Wang
b360e1aec3 Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851

Change-Id: I5fe20b28718cb999edc9d5e6c2fecd429e461ed8
 2021-07-09 18:00:08 +00:00
SongFerng Wang
f407616398 Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev am: cf327ae5ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15222851

Change-Id: I886d0112022c82460d3a26b943502ed07f2d0a0c
 2021-07-09 18:00:02 +00:00
SongFerng Wang
cf327ae5ba Merge "Fix internet panel doesn't show data rat after dds changed" into sc-dev 2021-07-09 17:47:13 +00:00