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

93011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d6bf57142a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3ec1d7acf840cad954ce6bb68134a4c4675fb7ab
 2021-07-17 20:51:26 +00:00
Bill Yi
67fee1eadc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5bdf169c9dfcf65379e55ec087c8f4dd9724dcb1
 2021-07-17 20:41:09 +00:00
Bill Yi
d0866cb948 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28f67cc180d5bc38770f6fa9f80bc6b8cf9852d5
 2021-07-17 20:37:34 +00:00
Automerger Merge Worker
a36a6d88d2 Merge "Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: fa4d019839" into sc-v2-dev-plus-aosp am: a04623c46d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: Id4afd1f3a606ca1ab7371d880126dfe8ff984f4b
 2021-07-17 01:15:50 +00:00
Curtis Belmonte
ab2f874f1b Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: 8d443bdebd am: 61d7968390 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: Ie2e1a95f8025605dce2c43c09370d536b56370d1
 2021-07-17 01:15:11 +00:00
Automerger Merge Worker
a04623c46d Merge "Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: fa4d019839" into sc-v2-dev-plus-aosp 2021-07-17 00:57:45 +00:00
Curtis Belmonte
6e5e15e767 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: dc04c265a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I7700e0f250eb66847c58c59d890123d1c41445ba
 2021-07-17 00:57:33 +00:00
Curtis Belmonte
61d7968390 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: 8d443bdebd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I581b985435d2c53aca8558bdea1ce148f263e85f
 2021-07-17 00:57:21 +00:00
Curtis Belmonte
f5f0e41d7e Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: fa4d019839 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I6cad3df08b0394000938bdf26be7bbeeef509323
 2021-07-17 00:57:19 +00:00
Curtis Belmonte
fa4d019839 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I8e42f13d6127890ffbb32c756c8d33b3c87366c2
 2021-07-17 00:52:49 +00:00
Curtis Belmonte
8d443bdebd Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: I73dd8540c975cdb535a5c0f008d98ecfcf4b23ac
 2021-07-17 00:51:02 +00:00
Curtis Belmonte
dc04c265a2 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15305557

Change-Id: If1680e7b6bf4836ad94d668fafceda85e5738c8a
 2021-07-17 00:51:00 +00:00
Curtis Belmonte
a18a8a1ad0 Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev 2021-07-17 00:47:14 +00:00
Curtis Belmonte
c6ced3fb21 Fail fingerprint enroll with error if HAT is null 
Fingerprint enroll expects a non-null HAT. If we don't have one, rather
than crashing or stalling out enrollment, fail fast with an error.

Test: Manual

Bug: 193811614
Change-Id: Ifb791e19430e33cb82566e4916ab1a7b997b32ff
 2021-07-16 14:35:25 -07:00
Bill Yi
0787f163fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours am: 895fb345fa -s ours am: 992efb2c83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I787c72985da188df0aae684b974deb5eefd36268
 2021-07-16 16:03:12 +00:00
Bill Yi
194420e2e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours am: deb6e762e1 -s ours am: 8220a53851 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I581a47b54ec566682308361e1c3e4e3146e57b94
 2021-07-16 16:02:03 +00:00
Bill Yi
992efb2c83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours am: 895fb345fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d840642d68ac3b909b14410af65eb01a1563538
 2021-07-16 15:53:39 +00:00
Bill Yi
8220a53851 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours am: deb6e762e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7ef10030b3c76c6e1688cc2b154d49ebd7c04d5
 2021-07-16 15:39:50 +00:00
Bill Yi
0c3257fef7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours am: cbcf7932c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5fcf7a99591a86c0e0cd12eaebc5627ece8d0050
 2021-07-16 15:38:26 +00:00
Bill Yi
895fb345fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3feb28d052d3cc4b1770ac21734cf979ac813856
 2021-07-16 15:30:20 +00:00
Bill Yi
cbcf7932c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9fc4cd8b7d27c93cf0e2f6f57ade9a305be40fd
 2021-07-16 15:29:35 +00:00
Bill Yi
deb6e762e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours am: 8b66811498 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddd79a76e845a403b4ea099c1a2b2e8758a7a6b8
 2021-07-16 15:29:31 +00:00
Bill Yi
569bcfaccc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours am: d74db1c939 -s ours am: b31e7319ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id623552bf62e7cff2438e3499c1672ba230a4e21
 2021-07-16 15:24:55 +00:00
TreeHugger Robot
f1bd8e9084 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours am: 72d510e78a -s ours am: fc9714007b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b28fa9928ad05482eea21ad73a535d4e5809e52
 2021-07-16 15:24:48 +00:00
Bill Yi
88b552ea70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours am: d7444103b7 -s ours am: f2172047ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1055297a776772f9f75ca7ca475523357b69882b
 2021-07-16 15:24:37 +00:00
TreeHugger Robot
fb69bedd57 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours am: 04407bd0b3 -s ours am: 92e8d024ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b49adbacf893f4db9b122da99bf9a0199bcc43b
 2021-07-16 15:23:52 +00:00
Bill Yi
8b66811498 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f660bf994 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27fd22e38caac8c1830c8af4f7a4c608c74b0035
 2021-07-16 15:15:54 +00:00
Bill Yi
b31e7319ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours am: d74db1c939 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I345858053f5278cd198191a2b5fb8bcf226f39f4
 2021-07-16 15:15:43 +00:00
TreeHugger Robot
fc9714007b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours am: 72d510e78a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie98fe8029c2ec028a4b05c4ebfb1adecf0a24f49
 2021-07-16 15:15:26 +00:00
Bill Yi
f2172047ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours am: d7444103b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40e6bbf05a568520ea51fb22312a6dbcc8535a3b
 2021-07-16 15:15:05 +00:00
TreeHugger Robot
92e8d024ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours am: 04407bd0b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I191468bc682fafa126fc5355ae9d2b6d7a0b0747
 2021-07-16 15:14:59 +00:00
Bill Yi
12463d37c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours am: 728315f696 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1b4bdb0504dd6333c901cd2da7c1b6adf7394fc
 2021-07-16 15:05:43 +00:00
TreeHugger Robot
03f23b726b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours am: a0cee9f717 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8b3b3c626031a5b34326cb32c25bd2a56a715c6
 2021-07-16 15:05:37 +00:00
Bill Yi
728315f696 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic88e2a9fddd1a07d7be96483e426310635dfa16c
 2021-07-16 15:05:30 +00:00
TreeHugger Robot
9b9bcd450a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 1a87f6494f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63ce58117a6fe11a7c5f4839687ea247d6be8c7f
 2021-07-16 15:05:28 +00:00
Bill Yi
d7444103b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56b73e4bee6fb85692bceb9b7dfeff4f20008de9
 2021-07-16 15:00:43 +00:00
TreeHugger Robot
04407bd0b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3efc9a014a0926eb958af335f346e843617fee3
 2021-07-16 15:00:29 +00:00
TreeHugger Robot
d1b1083a35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc60dff6bf -s ours am: 0fe7a8176a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9197dfdde00f9be65d12a797a211dd1708a9cb9
 2021-07-16 15:00:13 +00:00
Bill Yi
d74db1c939 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours am: aef4593a74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6636912484fe19d521a98c18fa4e19cf48816e9a
 2021-07-16 14:59:54 +00:00
TreeHugger Robot
a0cee9f717 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I756d81a8f8f7302cbde9d9e207fd27c9476b4b79
 2021-07-16 14:59:41 +00:00
Bill Yi
aef4593a74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2962edd9b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ac7dc76a303bb3ce71b1b4daf19b67d4dc76eeb
 2021-07-16 14:59:40 +00:00
TreeHugger Robot
72d510e78a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 026fba52e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42efbb54eda951275302b201b59acd6337100911
 2021-07-16 14:59:37 +00:00
TreeHugger Robot
1a87f6494f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-16 14:52:22 +00:00
TreeHugger Robot
1f0d7193b0 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-16 14:52:12 +00:00
TreeHugger Robot
026fba52e8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-16 14:46:30 +00:00
TreeHugger Robot
0fe7a8176a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc60dff6bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I599e1fd675a3de86cb41a6a42c734af35d8e947c
 2021-07-16 14:44:59 +00:00
TreeHugger Robot
bc60dff6bf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-16 14:31:28 +00:00
Stanley Wang
1fcdafbcda Fix the problem that the SIM status and IMEI after the "Build number". 
- Adding the SIM status and IMEI items of SIM2 to the PreferenceScreen
  can not put these items in the correct categories. We have to put
  these items directly into the correct categories.

Fix: 193384705
Test: robotest and see the UI

Merged-In: I2de7ee72fc1315eeef01288b386f8756ca366e33
Change-Id: I9472ecd604afe2f2e2eaf08c92ec11e439e8fc1d
 2021-07-16 22:03:54 +08:00
Stanley Wang
e039077efd Merge "Fix the problem that the SIM status and IMEI after the "Build number"." 2021-07-16 12:59:17 +00:00
Stanley Wang
74cde9c569 Merge "Update the illustrations of System navigation page." into sc-dev am: c916876cc7 am: 69a9d7aa11 am: 15738313b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15297631

Change-Id: I804e97c554f15cd48164b467630b0aba15d26fb5
 2021-07-16 12:30:09 +00:00