Commit Graph

26250 Commits

Author SHA1 Message Date
Joshua Mccloskey
8b6d40e167 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: 93f79d6774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: I4513264127184a92320636fee5cdf48e84ec7752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:31:30 +00:00
Joshua Mccloskey
93f79d6774 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Ibf89a7a3b58f076d694e2582ffcd950f5cc54142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:06:42 +00:00
Joshua McCloskey
69cc573b76 Add field to control margin in FaceEnrollIntro
Problem -> The require scroll mixin seems to scroll an entire device
length when a button click occurs. If you have page content
of 2x device_length + 10 pixels, a user will have to press the more
button twice to scroll this length. With the illustration_margin_bottom
field, devices can tune this parameter to allow the user to press
the more button once.

Fixes: 237474002
Test: Manual.
Change-Id: I9de2d74608260fe835870211a07b96249a8598f8
2022-06-29 19:07:44 +00:00
TreeHugger Robot
49a681bb37 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
Bill Yi
382bed292d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3c1724acd927e61e022d74d348092d256d2072ed
2022-06-20 23:19:45 -07:00
Bill Yi
2714015bac Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I09a80efa89b4558201beeb22aa7c854b2e86096e
2022-06-20 23:15:51 -07:00
Zaiyue Xue
6470ada117 Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446

Change-Id: I3e0ae9d1922b8d6f55721ec3357d529a58a56dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 09:32:47 +00:00
Zaiyue Xue
3b7953eac2 Merge "Move battery usage files to a separate folder." into tm-qpr-dev 2022-06-20 09:12:04 +00:00
xuezaiyue
ac7318419a Move battery usage files to a separate folder.
Bug: 202118250
Test: presubmit
Change-Id: I21aa58ebc02327849ed2161dbbafcdc806c007f2
2022-06-19 05:59:35 +00:00
Bill Yi
2652464d7c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I16bb20a52a58676aece02d01575bc32d710f5cd6
2022-06-18 19:29:15 -07:00
Bill Yi
cc8d8e568a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id834260c1bbd63b31793705e5fb0b22838d9d729
2022-06-18 19:24:50 -07:00
Joshua McCloskey
4be235f6a8 Added face unicorn strings am: 66211d15bf am: 909913ffc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: I30ce8688e2a51a3748559dbf5c29a8c0779a52ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 03:17:24 +00:00
Joshua McCloskey
909913ffc1 Added face unicorn strings am: 66211d15bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: Ia1006b9a2e9dc4f2264cf0be47b7e087216c30aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 03:01:36 +00:00
Joshua McCloskey
66211d15bf Added face unicorn strings
Test: Manual.
Fixes: 234663447
Change-Id: I57f0b52f645655647db38c58da2c158e63221c18
2022-06-15 21:07:16 +00:00
Bill Yi
2609fb2ccb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib54c2f3b145ff0c53809022e7baf4083d5ba1ca8
2022-06-14 21:21:00 -07:00
Bill Yi
f84049c4e7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iae080c4ad83f0090a8a4a6bcd2b2438564c563ec
2022-06-13 17:00:54 -07:00
TreeHugger Robot
3d8b8de2be Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-13 16:40:31 +00:00
Bill Yi
7b831dc400 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie29078a0f8a50a373604db8dbd4fd2272426add7
2022-06-11 13:26:42 -07:00
Bill Yi
3a3ba24088 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I417d9be4714e60a9e7a36c56e7bd9c8fbb620a89
2022-06-11 13:22:08 -07:00
Bill Yi
77b66b7495 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id13eb722fe69d4c571cfa68c8fe1fa729e218a38
2022-06-11 13:07:25 -07:00
Milton Wu
b6fbd10af4 Merge "Update SUW fingerprint string" into tm-qpr-dev am: 75d49b02bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753041

Change-Id: I61ce4d033c1f4cfa57347ad781c2ecbce4da20de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:40:24 +00:00
Milton Wu
75d49b02bc Merge "Update SUW fingerprint string" into tm-qpr-dev 2022-06-10 17:33:44 +00:00
Joshua Mccloskey
74d3ba859f Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a am: 62db0f71bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: Ide094dbadfbaa9fcbb5aefbf8c31523ae00d0184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:03:54 +00:00
Joshua Mccloskey
d32a6c0512 Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17 am: 4d48d8266d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135

Change-Id: I2a53040c4a9a4afee0815c2791a2d381b3dfa993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:03:11 +00:00
Joshua Mccloskey
62db0f71bc Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I034b937a7e24f0af32f2f7371a0b0711dfa19bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:37:30 +00:00
Joshua Mccloskey
02f0255b7a Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: I2424dc5d7377fd8f86f6d7d6c0dc14dfc274425d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:29:29 +00:00
Joshua Mccloskey
4d48d8266d Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135

Change-Id: I12156eb5416d5e7a30454ccffe32d6bdbb248e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:29:13 +00:00
Joshua Mccloskey
52450aaa17 Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev 2022-06-10 16:06:17 +00:00
Joshua Mccloskey
75313dcb5d Merge "Updated FP enroll confirmation string" into tm-dev 2022-06-10 16:05:31 +00:00
Bill Yi
21559f3793 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-10 06:17:14 +00:00
TreeHugger Robot
2b662c5a07 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-10 06:08:45 +00:00
Bill Yi
c1ebda67c2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3b4ba2fd47b3ab2f58a1eb962a12872f85f224f4
2022-06-09 09:49:56 -07:00
Bill Yi
5391d591c8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibb0a9c21fb33588f13b99a46a30dd191e28d587b
2022-06-09 09:45:40 -07:00
Joshua Mccloskey
0295bc2285 Merge "Add functionality to restart fp enrollment." into tm-qpr-dev am: 81224f09e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18788040

Change-Id: I0188ab24c487cc569645d1b07dbb25c94024df4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 16:09:27 +00:00
Joshua Mccloskey
81224f09e3 Merge "Add functionality to restart fp enrollment." into tm-qpr-dev 2022-06-09 15:37:53 +00:00
Bill Yi
307f491327 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1c5638e6e3c3eef94aad83f3799058fe9043e77b
2022-06-09 07:35:45 -07:00
Bill Yi
d142ec9f58 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I45c392de92cbb27ed670cb70b657074d0ac762e1
2022-06-09 07:31:39 -07:00
TreeHugger Robot
f700b7398c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-09 02:39:03 +00:00
Joshua McCloskey
0eb278b245 Added consent message for FaceAuth enrollment.
Test: Manual.
Fixes: 234663447
Change-Id: Iefd9b10eb634ed271f57b82e2a40be08dbbc1f61
2022-06-08 22:02:19 +00:00
Bill Yi
d98e536863 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I650e4197e0aff594a172c01f04cffd4092b7467d
2022-06-08 14:12:47 -07:00
Bill Yi
fe71b2e76c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
Joshua McCloskey
548f6f36c1 Add functionality to restart fp enrollment.
Test: Tested manually via SUW that restarting enrollment works
as expected.
Test: Tested manually via settings that restarting enrollment
works as expected.
Fixes: 234887288

Change-Id: I815392269da786d2dfd157267919a09281af6277
2022-06-08 21:00:59 +00:00
Joshua McCloskey
77452db3f9 Updated FP enroll confirmation string
Test: Verified correct string shows after FP enrollment.
Fixes: 234183906
Change-Id: I57e7ce836d4dc5ad2caf198aa59738f64dc4c049
2022-06-08 20:59:36 +00:00
Milton Wu
2069d2e17b Update SUW fingerprint string
Bug: 228021544
Test: Check string in SUW flow
Change-Id: Id0729b7f2758e98d53484ffd35282c6423f82262
2022-06-08 07:12:24 +00:00
Avinash Vadlamudi
1ed3556c63 Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev am: 26e3744221
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18751036

Change-Id: I1a0e8f88302132e700c9f07b802f44e412ceae1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 04:12:18 +00:00
Avinash Vadlamudi
26e3744221 Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
* changes:
  Rename method for better readability
  Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
Bill Yi
e6b9e1fdf5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Edgar Wang
94a7906033 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524 am: 7ab5a44498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I957fd8fde3ae1865148de0fdd7c6d32b9bb79217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 05:12:17 +00:00
Edgar Wang
7ab5a44498 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I3d2bdadb80d2a1189e8e7e69d883ac2f4763bbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:58:36 +00:00
Edgar Wang
47b4c86524 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I0f6f87246effdc808b77726a0519d4b063ef4fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:41:48 +00:00