PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,800 Commits 1 Branch 0 Tags
263c3eab4447ff2d673bfbd2b47f89e6089d8ccb
Commit Graph

85800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
263c3eab44 Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd am: 0cce02c985 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210

Change-Id: Iba5db461202a139d583f122bd4ef5048c0e20085
 2021-07-13 06:30:35 +00:00
Bonian Chen
0cce02c985 Merge "[Settings] Hide subscriptions not existed within device" into sc-dev am: 9c1e8b7ccd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220210

Change-Id: Ic019f1fb87a4f37c547c16aa6fb5189d108b3ff0
 2021-07-13 06:17:04 +00:00
Rajeev Kumar
41af063858 Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d am: 2a5fb15097 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350

Change-Id: I09b4e8d3c90d2c4f89348bae948cb069ea721ec5
 2021-07-13 06:09:09 +00:00
Bonian Chen
9c1e8b7ccd Merge "[Settings] Hide subscriptions not existed within device" into sc-dev 2021-07-13 06:08:17 +00:00
Rajeev Kumar
2a5fb15097 Merge "Enable hibernation by default for Settings" into sc-dev am: 6311d1fe0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167350

Change-Id: Ia9fa607e0a9fe4cba4d425a634659676e6af09c6
 2021-07-13 05:48:59 +00:00
Rajeev Kumar
6311d1fe0d Merge "Enable hibernation by default for Settings" into sc-dev 2021-07-13 05:35:34 +00:00
Bill Yi
9b1879135c [automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6 -s ours am: 4cc5d4371e -s ours am: d32e536a2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2387998ee285fd62a9c2454319c0875175b69c7
 2021-07-13 01:39:28 +00:00
Bill Yi
d32e536a2c [automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6 -s ours am: 4cc5d4371e -s ours 
am skip reason: Merged-In Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c with SHA-1 4909b81006 is already in history

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

Change-Id: Ib6641264f7b7f664fbbba85207f351e368b014a0
 2021-07-13 01:21:32 +00:00
Bill Yi
4cc5d4371e [automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: e36e5876d6 -s ours 
am skip reason: Merged-In Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c with SHA-1 4909b81006 is already in history

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

Change-Id: Ib6d3045e956672a1832742b1de90f8d000543c4e
 2021-07-13 01:02:57 +00:00
Bill Yi
e36e5876d6 Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" 2021-07-13 00:48:38 +00:00
PETER LIANG
1910983174 Merge "Update the preview image of caption preference fragment." into sc-v2-dev am: 00c2fb2a4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221070

Change-Id: Id02ecb6d4533e0864c71c22a2fcf9016ce349c92
 2021-07-13 00:34:25 +00:00
PETER LIANG
00c2fb2a4a Merge "Update the preview image of caption preference fragment." into sc-v2-dev 2021-07-13 00:23:30 +00:00
Bill Yi
7976c5bc51 Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE 
Merged-In: Ie37d07ed9cbce12b9dcd39b332ed2ae66f3edf6c
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Merged-In: I777bae14ea865ecf1607e1d660fe3102a9b8fa6d
Change-Id: I0f793ed1ea64127903c6dc906c5afa1db15fff48
 2021-07-12 11:08:29 -07:00
Bill Yi
f47a8c16c0 [automerger skipped] Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 275dc390bd -s ours am: 799b80f9d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4cdf18a0c58f48c7dbea230eb6ae99360ba7786
 2021-07-12 13:42:06 +00:00
Bill Yi
799b80f9d7 [automerger skipped] Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 275dc390bd -s ours 
am skip reason: Merged-In I2b0706fc636af827e9a7f76ca00c99653d569dbf with SHA-1 7639158022 is already in history

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

Change-Id: Ie1b18e903e1246e7020c6d3528f936b582347637
 2021-07-12 13:27:14 +00:00
Bill Yi
275dc390bd Merge "Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2021-07-12 13:14:39 +00:00
Treehugger Robot
bc08889feb Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a am: b664dbe93f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: Ic56026cffaa57fa4cc8a66c65f34ac833e30a624
 2021-07-12 11:02:20 +00:00
TreeHugger Robot
81da0b253f Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02 am: e39365282c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881

Change-Id: I2d3db0c25748706a9b2fca75f6e646972a62f99c
 2021-07-12 11:02:10 +00:00
Treehugger Robot
b664dbe93f Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: I53b5765f78098e466379454d228dda47cc007aa9
 2021-07-12 11:01:58 +00:00
TreeHugger Robot
e47237f563 Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02 am: 04ab26b286 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881

Change-Id: Ifcf7e6ac5440bc12fc3e441e0f3fff848f0a81ba
 2021-07-12 11:01:44 +00:00
TreeHugger Robot
04ab26b286 Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881

Change-Id: I5332bed652128641d5cb23678a1336f6ac5aa3a9
 2021-07-12 10:49:06 +00:00
Treehugger Robot
476c3dc62a Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: I48ab5a9d8bd431e6e9854d9f3c36373f95118cf6
 2021-07-12 10:49:01 +00:00
TreeHugger Robot
e39365282c Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881

Change-Id: I4f3a2d73374a9e51ea1da147d734b12e96767e0b
 2021-07-12 10:48:08 +00:00
TreeHugger Robot
5ab7e41f02 Merge "[Settings] Correct some typo" into sc-dev 2021-07-12 10:39:07 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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