PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,219 Commits 1 Branch 0 Tags
465b1caed381befefdfd3032c0deb45c81de2bcd
Commit Graph

92219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
8dd6ce02d8 Merge "Revise strings for the NFC developer option" 2021-07-12 10:38:43 +00:00
Bonian Chen
a239a6c53a [Settings] Hide subscriptions not existed within device 
For non-active subscriptions, the one inserted in slot
but turned off need to be visible to the user. However,
the one un-plugged need to be invisble.

Since SubscriptionUtil#getSelectableSubscriptionInfoList() didn't cover all the cases required. Create this one to fit into the criteria required here.

Note: subscriptions with same group UUID will be displayed seperately.

Bug: 191228344
Test: local
Change-Id: Ia68c23b007164b7520456cb6c7427ca142558b59
(cherry picked from commit 75f1450bbf)
(cherry picked from commit 0726f263a8)
 2021-07-12 17:32:59 +08:00
Bonian Chen
5d57ed1d51 Merge "[Settings] Rollback group UUID merging in SIM settings" 2021-07-12 08:45:58 +00:00
Jack Yu
cfb0bbc0d0 Revise strings for the NFC developer option 
Bug: 187083201
Test: build pass
Change-Id: Id90627235dbdb714d13a78b61826bafeb9f80360
 2021-07-12 16:39:22 +08:00
Bill Yi
c22fc19195 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours am: 2fe6e382d7 -s ours am: 323420f40d -s ours am: 4e1cd46eb7 -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: Icfc34b96d53beeb2dcaeb77a5e5c98a1ea0179c4
 2021-07-12 08:24:57 +00:00
Bill Yi
7f6e4f7d55 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours am: 2fe6e382d7 -s ours am: 51db20e4bb -s ours am: 143e739a87 -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: I86d40190561a646ab9b18687c67e6adc3fdc06b8
 2021-07-12 08:24:45 +00:00
Bill Yi
4e1cd46eb7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours am: 2fe6e382d7 -s ours am: 323420f40d -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: I495a3d26110103586ccd252c57126573b3242f65
 2021-07-12 08:08:45 +00:00
Bill Yi
143e739a87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours am: 2fe6e382d7 -s ours am: 51db20e4bb -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: I1d2fbfcc8cc7f09133020daf02154da325eb3d17
 2021-07-12 08:08:20 +00:00
Bill Yi
cf693a3301 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours am: 2fe6e382d7 -s ours am: 4a0edbcc55 -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: Iae686755d0fe16c6a919801c7830fed3034dac96
 2021-07-12 08:07:48 +00:00
Bill Yi
a07f53af42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea3600ce39 -s ours am: bf4b93129f -s ours am: 6306ac8576 -s ours am: 7d111e9b0b -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: Ic75227ca8db294090911c3cac6ae91f129a89d60
 2021-07-12 07:59:23 +00:00
Bill Yi
51db20e4bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours am: 2fe6e382d7 -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: I74a1eb0762a40e2406f445d1a3e104356fdbf5b5
 2021-07-12 07:55:17 +00:00
Bill Yi
4a0edbcc55 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours am: 2fe6e382d7 -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: I7b8bc9227bdce08c94ac23d0cced402add66f5b2
 2021-07-12 07:54:24 +00:00
Bill Yi
323420f40d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfc6a13ba -s ours am: 2fe6e382d7 -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: Ibdc3394f631c21cd9b390d61b657ff89fb53b824
 2021-07-12 07:54:16 +00:00
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