TreeHugger Robot
929c3860be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours am: 926cffbbea -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: If18b947bafefef0be6147d5962cc694616a8713b
2021-06-26 05:24:16 +00:00
Bill Yi
b3ae3367e7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours am: 76310b46a4 -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: I80ce7bc06e042ca031cb14aade3fa094c67e9587
2021-06-26 05:24:12 +00:00
TreeHugger Robot
51fd3b4ae4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours am: cadaadb462 -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: I1ea27380501919a7219475dff83ecfc921dd85fe
2021-06-26 05:24:00 +00:00
TreeHugger Robot
e325e43e75
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours am: 314dad2e61 -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: Ib14f62f48d2db8eeea7f2f90d8381e27fd46c680
2021-06-26 05:23:45 +00:00
Bill Yi
1e160aa7df
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours am: b994348b19 -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: I12a8bb7932a40cdaebe713600f82a9de1c158f45
2021-06-26 05:23:39 +00:00
TreeHugger Robot
d7e98f11bf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours am: 83d55613d5 -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: I9619f166433beeefc2b9d0297c32eab990d453e5
2021-06-26 05:23:32 +00:00
TreeHugger Robot
926cffbbea
[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: I010737d72105e9540992237716af3747f510d440
2021-06-26 05:14:49 +00:00
Bill Yi
76310b46a4
[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: Ib66d41ae033d461f6e26b3c59131eaa03f346df7
2021-06-26 05:14:42 +00:00
TreeHugger Robot
314dad2e61
[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: If3885e81393d34a70ad5b3e34889e3eebdd751f4
2021-06-26 05:12:19 +00:00
Bill Yi
b994348b19
[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: I2744c926e9f85a0afe710bc8ba6339c8b30e6db5
2021-06-26 05:12:12 +00:00
TreeHugger Robot
83d55613d5
[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: Ibd4615d4087d13d26217b4b941a11df2adc85ae2
2021-06-26 05:12:07 +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
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
cadaadb462
[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: I044b2c9e790d1418f1c34ebae5d31b849290b3bd
2021-06-26 05:10:49 +00:00
TreeHugger Robot
1b194500c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 82c7e98261 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115840
Change-Id: I5319ef42351edad0b3e8f0a35cfb539ecfd4d6c6
2021-06-26 05:02:15 +00:00
TreeHugger Robot
75f02a46d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 347666014d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115843
Change-Id: I25babbfa4dc76315ed1294bb7c66f3f1806b6100
2021-06-26 05:01:53 +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
edea8a6799
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-26 04:58:47 +00:00
TreeHugger Robot
82c7e98261
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-26 04:50:27 +00:00
TreeHugger Robot
347666014d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-26 04:49:47 +00:00
Bill Yi
0ea1d883ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9e0efc01f382094d5ce4884963635557e4be1370
2021-06-26 03:38:06 +00:00
Bill Yi
60c0a41746
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81ad12d0a40b94a0526b57b78da36829cbe722e9
2021-06-26 03:25:20 +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
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
Joshua Mccloskey
038be0f496
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde am: 0d9161fd98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: I91c313ce3f74d1ffbbcef940922717c383cf274f
2021-06-25 22:50:41 +00:00
Joshua Mccloskey
a32a4d6336
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde am: bb11038f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: I9c952b6ef63ca8850b72c7c967dcbff69bb0919f
2021-06-25 22:43:02 +00:00
Joshua Mccloskey
0d9161fd98
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: I1fd58cd49bba98b21744b98697ec85ac0e27de4c
2021-06-25 22:40:40 +00:00
Joshua Mccloskey
bb11038f28
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: I328f190dd86620ac874dbf5d18d2cabf9b88ea86
2021-06-25 22:39:06 +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
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
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
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
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
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
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
Julia Reynolds
3d22e9775a
Merge "Disable additional pkgs on DND perm page" into sc-dev
2021-06-25 14:56:13 +00:00