Commit Graph

95708 Commits

Author SHA1 Message Date
Curtis Belmonte
0cf4e6393f [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: Ic1acdad9cbe161b9f2aa5fa72bc569505bb66317
2021-09-05 03:48:59 +00:00
Curtis Belmonte
91cfb2c06c [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I5e527298abe4024bc5a8b1b42682e80a36c1e2a3
2021-09-05 03:48:42 +00:00
Curtis Belmonte
a49ce807d6 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: bb68c982de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: Iab6ea5af9b47e511713d21b195f468caa9789320
2021-09-05 03:48:18 +00:00
Curtis Belmonte
4f2f0ed6d5 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Id730b3ccfada949186db2ab61046ee57ca0b82dc
2021-09-05 00:11:08 +00:00
Curtis Belmonte
a9c1fa626b [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Ib88caa522f11d1be6bc3ef9479cfdefe4eabf10a
2021-09-05 00:11:06 +00:00
Curtis Belmonte
bb68c982de [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: I89a941373c69d41b40b111aa7fcd99aba2d14df6
2021-09-05 00:11:05 +00:00
Curtis Belmonte
4592bf62a3 Update char limits for new UDFPS enroll strings
Adds a character limit of 80 for titles and 160 for subtitles to be
shown as part of multi-stage UDFPS enrollment.

Test: Presubmit
Bug: 198847997
Change-Id: Ib85d1dc4f9bb127d641c84411f4dff2736484a5a
2021-09-04 17:08:01 -07:00
Presubmit Automerger Backend
ba015531c3 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 am: 4686860c50 am: 6ec46242cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: Ic9dc77409e944ac4e4925c09c6e64c93e1bdc48a
2021-09-04 23:49:28 +00:00
Presubmit Automerger Backend
97efc128f9 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 am: 8bca5db8d3 am: 48bc6b659f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

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

Change-Id: Ia66d507dd8682bb8c8b530ccb52af336ec17f5b3
2021-09-04 23:49:16 +00:00
Presubmit Automerger Backend
6ec46242cf [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 am: 4686860c50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: Ib57393361ced52d2d3233ccc06b85525a6788b9a
2021-09-04 23:38:21 +00:00
Presubmit Automerger Backend
48bc6b659f [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: c1b136b503 am: 8bca5db8d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

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

Change-Id: I898d80c0cd231482f8427da7e273a9b3237ec58c
2021-09-04 23:37:13 +00:00
Presubmit Automerger Backend
4686860c50 [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: I0a4c5f88cbc9770457ee04275a64546c03699c45
2021-09-04 23:24:48 +00:00
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
371ea979b6 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 am: 57fb953a03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Change-Id: Ib696dff1d2e530fd92c6b7db8cbe10979345aacf
2021-09-04 23:24:03 +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
Presubmit Automerger Backend
57fb953a03 [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: I1d552d3d428f400d7182b2e4a3389d4c3b8d9ba6
2021-09-04 20:49:33 +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
4eb2f8f23c [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: c003bc13f7 -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: Ic517c23ec79e12d7c756dfc35a56ed72b696dbab
2021-09-03 21:14:06 +00:00
Bill Yi
e00df0a31d [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: 1c2c9f6c42 -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: I8ba0dbe8e6844ec83683d2878e0779257f6f8e37
2021-09-03 21:14:01 +00:00
Automerger Merge Worker
828ee225c2 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: 55e2fdbe94 -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: Icc24cfd3b56403330682cf12c01127a8affe4b17
2021-09-03 21:13:56 +00:00
TreeHugger Robot
c69ec48973 [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: 86a970f2f6 -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: I83f76ff6bdeef6c3346db149785c05e996ecfba1
2021-09-03 21:13:50 +00:00
Bill Yi
78bdf9e067 [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: 3f2b7b186a -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: I183ab88bd127ebc2890a55e5efb2699224668709
2021-09-03 21:13:45 +00:00
Bill Yi
299eb0df13 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb am: 61af3ca025 am: 5cf016c4c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: I6f92b92efabbfab07ab0488c59f188ee3e58ef7c
2021-09-03 21:13:38 +00:00
Bill Yi
9dd8dbfff6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours am: 08d52721f9 -s ours am: dd8ef157ec -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: I1e6bc873b0e1d1485e7c182c8824260d102d1618
2021-09-03 21:13:37 +00:00
Bill Yi
efdf542ccf [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: 9454c648f4 -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: I4f6432f8a2f138fba6ed6f48c91ab81d91451c7e
2021-09-03 21:13:30 +00:00
Bill Yi
cfb8f5bcd4 [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: 14df0978f4 -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: I002de77438ac7915e8da803c62c0d7609f4c2492
2021-09-03 21:13:25 +00:00
Automerger Merge Worker
c8a683e011 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 am: ed6231d52f -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: I38eb6d617967f78169cbbc0c0918d0c3c97c5e29
2021-09-03 21:13:20 +00:00
TreeHugger Robot
8e194928db [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: 3dbbc1f2b6 -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: If52720b06d7039f7af54be4c04969e467253def6
2021-09-03 21:13:13 +00:00
Bill Yi
3eff66be91 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb am: 516823e59e am: 1df8205c2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: I596b74c62d40bb53e8f503f6bf2545891469d095
2021-09-03 21:13:02 +00:00
Bill Yi
234a108ae9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: 914dc714a2 -s ours am: ec49cd0182 -s ours am: 56eb2c3a2d -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: If5b7d3ab4c73b4a09cb96a1748a53f5333389cda
2021-09-03 21:13:01 +00:00
Automerger Merge Worker
80d89d3408 Merge changes from topic "am-4518399b59a1469084ce724347b5bde1" into sc-v2-dev-plus-aosp am: cf02f67258
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: Iefe58b52b3c1b9f1a9046a408d790859960b4b00
2021-09-03 21:12:42 +00:00
Bill Yi
3967674e06 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: e7f4e52031 -s ours am: 441f770ddd -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: Iced857572e225545e8399a6444ecec7f74399d78
2021-09-03 21:12:39 +00:00
Bill Yi
1ac50d69bf Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64 am: a87573a588 am: 740cc82a19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I83eaf234db994f34dbdedfe95494f198e648190a
2021-09-03 21:12:25 +00:00
Bill Yi
f785d4d5d6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 8b34aa6114 -s ours am: af37131dd0 -s ours am: 558125edee -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: Ia18d8d7aea69f6b8e1bec6af5b227856b8976705
2021-09-03 21:12:24 +00:00
Bill Yi
d50ce7312e Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp am: 46a1f58755 am: f897c41728 am: 1b80b5addd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126

Change-Id: Idd9f43952260ee02146706f134170413e583b2aa
2021-09-03 21:12:03 +00:00
Bill Yi
e19608c63c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 am: fefa801325 -s ours am: 1996b1c872 -s ours am: 25394809bc -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: I8456bc38c15be49d88f32245f5ab1a2b3ab44905
2021-09-03 21:12:02 +00:00
Bill Yi
30836cba59 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-dev-plus-aosp am: 097d024fe5 am: 9c5164530c am: db93d62434
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952

Change-Id: I5a8ae634a6dd6c15b0f953e3bd9bf33ae4816fd0
2021-09-03 21:11:43 +00:00
Bill Yi
ee5bfb5b34 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 am: 78c0f840f7 -s ours am: d741fbde5c -s ours am: 249b452404 -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: I8d0cd1cae6778a518b8f034dfb41f2d6089f9d94
2021-09-03 21:11:40 +00:00
Automerger Merge Worker
47e152feab Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: b33a9e9bca -s ours am: b0f2b985f2 -s ours" into sc-v2-dev-plus-aosp am: eb875dacc7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb8a490d347095db718026bc7c612ca10b2155e6
2021-09-03 21:10:45 +00:00
Bill Yi
450448f262 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: b33a9e9bca -s ours am: 4277c065af -s ours am: 2e539bf197 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I64890976ae4db572e2fab429569d4525b07bff0f
2021-09-03 21:10:16 +00:00
Bill Yi
3530f0e194 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours am: 9df033b383 -s ours am: b5590eddc6 -s ours am: ecfab9c464 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa8ed853797298f535b41b5c91b794d7bbe1c8aa
2021-09-03 21:09:41 +00: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