PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,637 Commits 1 Branch 0 Tags
184e77a8d5b31b50ab3c70c08bd891757916bef0
Commit Graph

87637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Presubmit Automerger Backend
8bca5db8d3 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I1cbf1709e0a934874d41ff4def45d806e1f36ae8
 2021-09-04 23:24:47 +00:00
Presubmit Automerger Backend
39928c53fc [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: 8d82ccdc24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: I6ea222460fa8c4653943e0c4bc73ea07bb1c2b52
 2021-09-04 23:24:30 +00:00
Presubmit Automerger Backend
8d82ccdc24 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: I5ba1c5d10c85b1dec25f4f2438439924585d9c3b
 2021-09-04 20:49:34 +00:00
Presubmit Automerger Backend
c1b136b503 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: Iaec5471868501824dbb0aa4cfe76feeff698133c
 2021-09-04 20:49:34 +00:00
Curtis Belmonte
c84e18b253 Add new strings for UDFPS 4-stage enrollment 
Adds strings that will be shown during the new tip and edge enrollment
stages of the UDFPS enrollment flow.

Test: Presubmit

Bug: 198847997
Change-Id: I11a9889ec0e5079c3531367bfa397a1910f42af6
 2021-09-04 13:48:28 -07:00
Bill Yi
c003bc13f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: 790491bc0f -s ours am: 5978ae7c3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30171c6cac3290ed2999673a5f2ced85da011a0e
 2021-09-03 20:59:50 +00:00
Bill Yi
1c2c9f6c42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: e49c8b9929 -s ours am: f4368a3a41 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98a000adb1a309ed4b623fc0a1289d13bd61b8c5
 2021-09-03 20:59:46 +00:00
Automerger Merge Worker
55e2fdbe94 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: e183f5a054 -s ours" into sc-qpr1-dev-plus-aosp am: eea7ed8ba2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4008ce63cce59b87930dafd05240a6b694bcde41
 2021-09-03 20:59:43 +00:00
TreeHugger Robot
86a970f2f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 0c0b1bf900 -s ours am: 7c189c31fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5208cbdfb9e67ddd4828464999a702351512865
 2021-09-03 20:59:39 +00:00
Bill Yi
3f2b7b186a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: a4512d2431 -s ours am: ec8b0cc8ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib72d7a2177deb287f92ee43ecf8f0ce97d8b14b1
 2021-09-03 20:59:34 +00:00
Bill Yi
5cf016c4c5 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb am: 61af3ca025 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: If18241c1b9dee92eb5fbbe0c5b7d3db77235171f
 2021-09-03 20:59:30 +00:00
Bill Yi
dd8ef157ec [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours am: 08d52721f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3375bb436a062a3f731e2eb5f55842d31a1e4a59
 2021-09-03 20:59:29 +00:00
Bill Yi
9454c648f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: 790491bc0f -s ours am: 64caad51c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36f02603736b27a2fde5f8c03c1c6096a28dba1e
 2021-09-03 20:59:24 +00:00
Bill Yi
14df0978f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: e49c8b9929 -s ours am: 15c25fb7df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iede457a60e62d894875636789a7fced154f9dd58
 2021-09-03 20:59:19 +00:00
Automerger Merge Worker
ed6231d52f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 871ba0bacd -s ours am: 977c1d696d -s ours" into sc-v2-dev-plus-aosp 2021-09-03 20:59:18 +00:00
TreeHugger Robot
3dbbc1f2b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 0c0b1bf900 -s ours am: b36d7379e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia96c31de25884f3de2206f01f9cb219b32a74fa5
 2021-09-03 20:59:16 +00:00
TreeHugger Robot
208f903db7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 871ba0bacd -s ours am: 977c1d696d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I382fee248481fd93951f1f8bdab53ce40006b248
 2021-09-03 20:59:16 +00:00
Bill Yi
1df8205c2f Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb am: 516823e59e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: I0076e66cfacd542a436617657321d03b09346723
 2021-09-03 20:59:11 +00:00
Bill Yi
56eb2c3a2d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours am: ec49cd0182 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e4972edd3673d6eec8492378bfcf2068a6ba258
 2021-09-03 20:59:10 +00:00
Automerger Merge Worker
cf02f67258 Merge changes from topic "am-4518399b59a1469084ce724347b5bde1" into sc-v2-dev-plus-aosp 
* changes:
  Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 am: f51b63cfb0
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: e7f4e52031 -s ours
 2021-09-03 20:59:04 +00:00
Bill Yi
3ebb9a2928 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 am: f51b63cfb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: Ic85ab08e0d7b9303b6990921837f3866fbe0c1a6
 2021-09-03 20:59:03 +00:00
Bill Yi
441f770ddd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: e7f4e52031 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I930321ed8ba8c59ab1e30c517298309d70421227
 2021-09-03 20:59:02 +00:00
Bill Yi
740cc82a19 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 am: a87573a588 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: Ia6fb3dc66c83dd6908012265d74700bf4853ee05
 2021-09-03 20:59:01 +00:00
Bill Yi
558125edee [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: af37131dd0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b0e285ff5bb09c89ed102af84f909cbb4e3fbe7
 2021-09-03 20:58:59 +00:00
Bill Yi
1b80b5addd Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp am: 46a1f58755 am: f897c41728 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: Idc6d5a64995653b3cc2cc8dd8af696882442d91e
 2021-09-03 20:58:48 +00:00
Bill Yi
25394809bc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: fefa801325 -s ours am: 1996b1c872 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43d03bed0e02194bbd5581201ede2798cec8231a
 2021-09-03 20:58:47 +00:00
Bill Yi
64caad51c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: 790491bc0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36a2557cc817c200067583c4534a7c08a008a250
 2021-09-03 20:58:00 +00:00
Bill Yi
5978ae7c3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: 790491bc0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9eddac69d363aae3ccd8bcc88cd43418066b477b
 2021-09-03 20:57:59 +00:00
Bill Yi
15c25fb7df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: e49c8b9929 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie698240f1aac62213115d858e9626850c3aaf48d
 2021-09-03 20:57:56 +00:00
Bill Yi
f4368a3a41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: e49c8b9929 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaad4618eab571c26603c6b0070bea4d30ed0de11
 2021-09-03 20:57:55 +00:00
Automerger Merge Worker
eea7ed8ba2 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: e183f5a054 -s ours" into sc-qpr1-dev-plus-aosp 2021-09-03 20:57:34 +00:00
TreeHugger Robot
b36d7379e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 0c0b1bf900 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9445bef9d761d93011c6662de3c4f2f331e9be19
 2021-09-03 20:57:34 +00:00
Bill Yi
cfa2baf197 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours am: e183f5a054 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ae81087d4799078266bf773ecf8e2052e12eb19
 2021-09-03 20:57:32 +00:00
TreeHugger Robot
7c189c31fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 0c0b1bf900 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad35c50c9031283d3d8f6bfdbd0e784ec0bffc67
 2021-09-03 20:57:31 +00:00
Bill Yi
ec8b0cc8ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours am: a4512d2431 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71305eb53cd4a496c0bc5a281cf58cb709d87a8d
 2021-09-03 20:57:24 +00:00
Bill Yi
61af3ca025 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: I0c4ebf5f1ddc29321e473eeb8147dcc6e569a3fe
 2021-09-03 20:57:06 +00:00
Bill Yi
08d52721f9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae70243bc2627f6a5947c02f3f6dd8b706cf1ca4
 2021-09-03 20:57:05 +00:00
Bill Yi
516823e59e Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: I3785da807138232c50a73c9ac6ef296f19c9adc2
 2021-09-03 20:57:01 +00:00
Bill Yi
ec49cd0182 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c5ee2d9be3458991e2e5130a302d0e6d8d08641
 2021-09-03 20:57:00 +00:00
TreeHugger Robot
977c1d696d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours am: 871ba0bacd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I723b3bc16316fa8a3e84788763171f2a25f66338
 2021-09-03 20:56:13 +00:00
Bill Yi
790491bc0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fff9127a356f4942996e07da5ecc57d9b60bd92
 2021-09-03 20:56:02 +00:00
Bill Yi
f51b63cfb0 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I16f4670c8a3fdaa8b3bc06bfa6d4dbf712c6b210
 2021-09-03 20:56:02 +00:00
Bill Yi
e7f4e52031 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id27003c39116a7f842bc31ccf037b48b587b6778
 2021-09-03 20:56:00 +00:00
Bill Yi
e49c8b9929 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81ecebfcb12ac6b2909fad8999e83c22a9cae361
 2021-09-03 20:55:53 +00:00
Bill Yi
e183f5a054 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie81fba7f2c1f2de6a35d4e83919474b1c43819fc
 2021-09-03 20:55:47 +00:00
Bill Yi
f897c41728 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp am: 46a1f58755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: If9f697a82c13be2aa1460620e21c4ff320912f89
 2021-09-03 20:55:47 +00:00
Bill Yi
1996b1c872 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: fefa801325 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dd6a6351f37de8e2dd0d85d57d28cce932de93d
 2021-09-03 20:55:47 +00:00
Bill Yi
a87573a588 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I49900fb9eb356739642c89c568fc64cc28e2d1c2
 2021-09-03 20:55:45 +00:00
Bill Yi
af37131dd0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cb5efcd328f63618808b24111a0dc86bad57b42
 2021-09-03 20:55:44 +00:00
Bill Yi
a4512d2431 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcd291d6f5de8bb470df5b33500429d37352e9de
 2021-09-03 20:55:42 +00:00