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
PETER LIANG
00c2fb2a4a Merge "Update the preview image of caption preference fragment." into sc-v2-dev 2021-07-13 00:23:30 +00:00
Curtis Belmonte
68c12f2e04 Add "eyes open" setting message to face enroll intro 
Adds an additional message about the "Require eyes to be open" setting
for Face Unlock to the intro/consent screen of enrollment, gated by a
config flag.

Test: Manual

Bug: 192272785
Change-Id: Idcd2395a290b74f4578898fdfebd05b81cd74075
 2021-07-12 17:05:45 -07:00
Daniel Chapin
e7cb2762f9 Revert "Rename Enhanced MAC Randomization to Non-Persistent" 
Revert submission 15050857-RenameEnhancedMac

Reason for revert: Droidfood blocking Bug: 193375403
Reverted Changes:
I5d647a666:Rename Enhanced MAC Randomization to Non-Persisten...
I48a326f98:Update old terminology for Non-persistent Mac Rand...

Change-Id: Ic6ff02dad064f8d8c7dbaab51c658da12a4d8555
 2021-07-12 22:54:21 +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
71971ec4ef [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: f47a8c16c0 -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: I4d010b748e2388bc2f6456ae3738390758448f1c
 2021-07-12 13:56:27 +00: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
0e371c63ae Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a am: b664dbe93f am: bc08889feb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

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

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

Change-Id: I182da00abf21afbb90506226990d258161a0690e
 2021-07-12 11:10:29 +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
853c37c0e4 Merge "[Settings] Correct some typo" into sc-dev am: 5ab7e41f02 am: 1faaefee9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15227881

Change-Id: I8fb1895d00438d21cb72cdf6483c778149653b02
 2021-07-12 11:01:19 +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
1faaefee9c 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: I50899d08d1e6ed99987adaa6f21f65f0d0f198c6
 2021-07-12 10:48:12 +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
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