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
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
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
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
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
b76c7bcd31
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id512e5ce55b9772c2fdaeeaabb9bbfbab0e10a90
2021-06-26 03:04:02 +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
Wendy Sung
664e1e676b
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
am: 1d909e6649
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: I3729981cd4282cf60a55122e45d708a9d7d59acc
2021-06-25 16:57:32 +00:00
Rajeev Kumar
7dc3bb906b
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
am: 2381645bda
am: 4e7b43a73e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: I81f1518348dda9fabaa2cec99c5bc2c3a77b5684
2021-06-25 16:41:06 +00:00
Julia Reynolds
4b548cfc8e
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
am: d802ef1614
am: 94542a34b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: I15ee404cb12972526fac4477d511da4a9d52971c
2021-06-25 16:40:38 +00:00
Zimuzo Ezeozue
4c694093ad
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
am: d6bb420ffa
am: 069f836135
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: I4dd6910993a9fc3409e022ca9400497fe63f86c2
2021-06-25 16:40:19 +00:00
Wendy Sung
15ace50e18
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
am: 5b40172e5a
am: a3404607fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: I95af54f6986921f8e8817f8ee3907dc3653b89ae
2021-06-25 16:39:55 +00:00
Rajeev Kumar
4e7b43a73e
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
am: 2381645bda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: I5b64bcbcca1ce9c85a554e1f0c578f920a7ab3ce
2021-06-25 16:39:19 +00:00
Rajeev Kumar
b16e89ac1a
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
am: bbe37e2764
am: f3f3db186f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: I7adbc49cce6b1cdcc7d414f2e7a86cf7ae844a66
2021-06-25 16:34:25 +00:00
Julia Reynolds
ebefd615d8
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: I910d0976c26d0e1df0760e75b8c3117d36afd892
2021-06-25 16:29:45 +00:00
Zimuzo Ezeozue
73c1c1017c
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: Ief22b91b41b4ae0d44bc8ec20560800132bdd712
2021-06-25 16:29:18 +00:00
Wendy Sung
1d909e6649
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: I4bd718dfdc506824e5e9ff96e5218cf433408804
2021-06-25 16:28:22 +00:00
Rajeev Kumar
2381645bda
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: I13f62a014f6f300a8d5aa9b69d47760cff3896de
2021-06-25 16:25:33 +00:00
Julia Reynolds
94542a34b8
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
am: d802ef1614
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: Ib285f72bf98de1308b5fc8aa9cebbac42011e467
2021-06-25 16:24:14 +00:00
Zimuzo Ezeozue
069f836135
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
am: d6bb420ffa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: Ic0894449254aaf0e2488c7f92b224208f5095496
2021-06-25 16:23:51 +00:00
Wendy Sung
a3404607fc
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
am: 5b40172e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: Ice4e40cdeba942a35761fd444d4719f6f3d64138
2021-06-25 16:23:10 +00:00
Rajeev Kumar
f3f3db186f
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
am: bbe37e2764
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: Ia011f75e7b19175da595dd59518739a5c31db1b5
2021-06-25 16:17:36 +00:00
Julia Reynolds
d69276d59e
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
am: 8d4d54998d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: I840b45fe8f8440dfd8d0f7b55ef614e373f1e854
2021-06-25 15:16:29 +00:00
Julia Reynolds
8d4d54998d
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: Ia5ab926a59272d2940522e69319dc1b13dcb85c2
2021-06-25 15:07:38 +00:00
Julia Reynolds
d802ef1614
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: I74b2da6ee478465ba6d3c4106fa6b13d1c9751cf
2021-06-25 15:07:27 +00:00