TreeHugger Robot
98fb515762
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours am: e78163f7c7
-s ours am: 6de3887716
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834
Change-Id: I2ce3a43c58e82d0b485f6aa5d17f18c09bde7a06
2021-06-26 05:23:19 +00:00
Bill Yi
193c47118d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours am: 4621b36198
-s ours am: fbb0783097
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032
Change-Id: I68033d147bc22f8e8f0433f9a84b21ed87058007
2021-06-26 05:23:12 +00:00
TreeHugger Robot
6de3887716
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours am: e78163f7c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834
Change-Id: I3bab0563590d52f04f1331d1140e3cdc64c7a3af
2021-06-26 05:18:44 +00:00
Bill Yi
fbb0783097
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours am: 4621b36198
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032
Change-Id: Idf63a94f20b9ff08dc4f258849445ffe5d422acc
2021-06-26 05:18:38 +00:00
TreeHugger Robot
75d9202613
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours am: ce6e84f830
-s ours am: 75075b106e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: Ifd6dc18ea199360e46cce3cf956445b56eb1d553
2021-06-26 05:18:36 +00:00
TreeHugger Robot
e78163f7c7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834
Change-Id: I582c95f5d4f7e1ae9ec4b3e4914e0ba4891242bb
2021-06-26 05:15:41 +00:00
Bill Yi
4621b36198
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032
Change-Id: Ia2f670479503f1f1c2aacb2d04d7d0d7c5814cb7
2021-06-26 05:15:33 +00:00
TreeHugger Robot
75075b106e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours am: ce6e84f830
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: I019ec88ca84edabf398c7ce8f653b5152cc5d461
2021-06-26 05:15:30 +00:00
Bill Yi
ad71ac58a5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours am: 28cd196a94
-s ours am: 752d115af3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: I2bb32a5bc032043b26bbc101206765e7fe14b5f7
2021-06-26 05:15:23 +00:00
Bill Yi
752d115af3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours am: 28cd196a94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: I260cd61b3cdec9423743033b427a70f4301ddc2e
2021-06-26 05:15:19 +00:00
TreeHugger Robot
fe07fc3087
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799
-s ours am: 9fa5aba57d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417
Change-Id: I19c324a4bfc2548cfff437b1d72f7d08b90604f9
2021-06-26 05:15:17 +00:00
TreeHugger Robot
1c8ca39959
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 7a2b7d7dbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115833
Change-Id: I8d0a1cc425c91c718bde6196b7212c56069dba5e
2021-06-26 05:15:12 +00:00
TreeHugger Robot
de42fd75fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 240df19188
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116046
Change-Id: I17f96b1786c36bd156791a25de540002c20f3e0c
2021-06-26 05:15:04 +00:00
TreeHugger Robot
28dbcbf459
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-06-26 05:13:39 +00:00
TreeHugger Robot
ce6e84f830
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: I88919988edfdee2caa05df3317f351e903e10f31
2021-06-26 05:11:35 +00:00
TreeHugger Robot
9fa5aba57d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417
Change-Id: I056e3a2e607750f4431a58bf2f2876ff5aec6028
2021-06-26 05:11:23 +00:00
Bill Yi
28cd196a94
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: I54ab7d9f2758a59cf18c6e1cdfb8eebb47a387d9
2021-06-26 05:11:20 +00:00
TreeHugger Robot
7a2b7d7dbd
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-26 05:11:09 +00:00
TreeHugger Robot
a914f1f256
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-06-26 05:05:21 +00:00
TreeHugger Robot
240df19188
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-26 05:02:57 +00:00
TreeHugger Robot
b92673984b
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-26 05:01:37 +00:00
TreeHugger Robot
1a059ed14e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-06-26 04:59:40 +00:00
TreeHugger Robot
edea8a6799
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-26 04:58:47 +00:00
Bill Yi
d5122c99da
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I681bb40cd81659cd790720d325eca43e2f7fa0df
2021-06-26 03:29:07 +00:00
Bill Yi
9f28edb782
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1fcdc5845232e672d3eb3a28aaf1c094886a3f09
2021-06-26 03:23:44 +00:00
Bill Yi
099228835a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6a64c001578a58dd1ca7d67c7208a2b68277e3c6
2021-06-26 03:22:09 +00:00
Bill Yi
130e0ec1ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9e83b41c6c7836d1189d68db61d17f4261f4f920
2021-06-26 03:19:15 +00:00
Bill Yi
4f307c462f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If1e176b4aecb4b1db470d97eb30501c75f893dfe
2021-06-26 03:15:46 +00:00
Bill Yi
4807ff8a84
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8fc0d492b2e23f8c1d01b97b6d551bc818b63873
2021-06-26 03:11:20 +00:00
Bill Yi
aa649a6fe5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1b011f8ce25dbc3fdb374eddf0b9c13015907427
2021-06-26 03:07:35 +00:00
Bill Yi
b76c7bcd31
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id512e5ce55b9772c2fdaeeaabb9bbfbab0e10a90
2021-06-26 03:04:02 +00:00
Bill Yi
ef757416ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I35a2f4eb8cce153bb6829fefd265c2f9251fca8b
2021-06-26 03:02:32 +00:00
Joshua Mccloskey
88d7246a45
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde
am: 825141c44f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: I5819cc355975cf17fa9d475c331ce261e2757021
2021-06-25 22:56:58 +00:00
Curtis Belmonte
d0371b89a3
Update strings for choose lock password/pattern screen am: 4aa1e532db
am: 8383785335
am: 2d7a4ae1f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: Ibae4cbd90bd64734a0282f520b5331a2e771c478
2021-06-25 22:55:47 +00:00
Curtis Belmonte
37aeae8126
Update strings for choose lock password/pattern screen am: 4aa1e532db
am: f55508ca36
am: ef3c4de35b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: Ic1eb1463687ec81cc067674b63bcbad4e4541307
2021-06-25 22:54:03 +00:00
Joshua Mccloskey
825141c44f
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: Ib83ae30cf25ad2f08e7b8ca75c8e0b5e6383dcf1
2021-06-25 22:40:27 +00:00
Curtis Belmonte
2d7a4ae1f2
Update strings for choose lock password/pattern screen am: 4aa1e532db
am: 8383785335
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: Ib451fb9011dab4e2cd15548f45d54ce12d9b85e0
2021-06-25 22:37:34 +00:00
Curtis Belmonte
ef3c4de35b
Update strings for choose lock password/pattern screen am: 4aa1e532db
am: f55508ca36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I4d778ffca11beaea5ef20598e5d0ef1fd2a07d0e
2021-06-25 22:37:19 +00:00
Joshua Mccloskey
477c5d9cde
Merge "Updated fp bad calibration string" into sc-dev
2021-06-25 22:37:01 +00:00
Curtis Belmonte
47685ca834
Update strings for choose lock password/pattern screen am: 4aa1e532db
am: ff05ace156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: Id192ac7542d144af908ce8bd070a33e0e419fd54
2021-06-25 22:36:36 +00:00
Curtis Belmonte
8383785335
Update strings for choose lock password/pattern screen am: 4aa1e532db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I431592731d3598a8e6d40c86754f7939de9ca156
2021-06-25 22:03:43 +00:00
Curtis Belmonte
ff05ace156
Update strings for choose lock password/pattern screen am: 4aa1e532db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I179150369d8734180cd504daa1a8738e395875e7
2021-06-25 22:02:57 +00:00
Curtis Belmonte
f55508ca36
Update strings for choose lock password/pattern screen am: 4aa1e532db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I81bf482c5372078c1a07624a710a4c79f9ec9eb3
2021-06-25 22:02:54 +00:00
Curtis Belmonte
4aa1e532db
Update strings for choose lock password/pattern screen
...
Makes the following changes to the header/description text shown on the
choose lock screen:
- Remove references to "biometrics" in favor of "face or fingerprint"
- Add a default description when setting a PIN/pattern/password
Test: Manual
Bug: 191923052
Change-Id: I788fd03aaeea624fab548d1c055c5c6dee076e2d
2021-06-25 12:59:47 -07:00
Joshua Mccloskey
05689a3432
Updated fp bad calibration string
...
Test: Verified string was present during enrollment error.
Bug: 189133688
Change-Id: Ia9a447c443fa0784c736e171a2e1840fed55034c
2021-06-25 18:32:19 +00:00
Julia Reynolds
eccb6b9048
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
am: ebefd615d8
am: c22803d428
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: Ibb4f5cf127911e61455e148a28f2e758cfc15f51
2021-06-25 17:01:22 +00:00
Zimuzo Ezeozue
580dc55c3c
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
am: 73c1c1017c
am: 1f9b116211
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: I6f8dfe4f37b3230c8b5e98eb84801547139d76fb
2021-06-25 17:01:16 +00:00
Wendy Sung
20bd2923db
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
am: 1d909e6649
am: 664e1e676b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: I551f47ce771e20bde9f775d00214d8cd47784d23
2021-06-25 17:01:00 +00:00
Julia Reynolds
c22803d428
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
am: ebefd615d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: Ib4e408b4cccaf8e7064f92ed4ad99ae4c239c5a5
2021-06-25 16:57:43 +00:00
Zimuzo Ezeozue
1f9b116211
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
am: 73c1c1017c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: I0b3893415b12c71f41e7c6b4d04905de46c8e808
2021-06-25 16:57:39 +00:00