Commit Graph

90508 Commits

Author SHA1 Message Date
TreeHugger Robot
23903da4b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f0708e90f6 -s ours am: e690d1c9ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1029d02f1125f8e321c084ca43c1cc9f9ebca3e
2021-06-24 20:23:54 +00:00
TreeHugger Robot
2e9a4489db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours am: 4b811bbe2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd5fe313578b51ee414e6ca07e32f1f288319ea3
2021-06-24 20:23:44 +00:00
Bill Yi
4a92a84003 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours am: d8c874e5c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5431685d903a98466027994827d8d147c39af823
2021-06-24 20:23:29 +00:00
TreeHugger Robot
4b811bbe2a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If0bc45d18a5a5ad32d977f2c1d5882710676a210
2021-06-24 20:18:41 +00:00
Bill Yi
d8c874e5c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f329c4702d335f325c18b3f6c7d44734ebc4fde
2021-06-24 20:18:37 +00:00
TreeHugger Robot
154bab9830 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If88af61c543edb467acd77ad807c58c807d14a82
2021-06-24 20:18:00 +00:00
Bill Yi
a6268f29d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9fa08277478fabc70550a90061e1759ebf18ca00
2021-06-24 20:17:52 +00:00
TreeHugger Robot
510d842992 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48915126bede1c00e53af1f9f85414a9fb7f6034
2021-06-24 20:15:26 +00:00
Bill Yi
6ace7cdcb2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebc27f5c780f1483cc216fde9ec712a2bd4f1066
2021-06-24 20:15:22 +00:00
TreeHugger Robot
cb3096af34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic835ded7c7cf0409344720eb663153b6a6df1b6c
2021-06-24 20:15:18 +00:00
Bill Yi
3716c2a75f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iecb99258b8a0a0acbefbabb11d17b8a8b4d1cf16
2021-06-24 20:15:14 +00:00
TreeHugger Robot
2ac3bc7a2a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1fcb35daec8ac19969b6181411407ae1b391ff95
2021-06-24 20:15:05 +00:00
TreeHugger Robot
033bce6ee6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours am: 8acff55c46 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c6bb3f283c8526dc19eabc0d48a83a565e11802
2021-06-24 20:14:42 +00:00
TreeHugger Robot
b8bd54cd94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I157969d7a1a3f3b5cab29f3e9ecec9e3c89dba92
2021-06-24 20:14:39 +00:00
Bill Yi
79cdc61fed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours am: 8068e3e113 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7a93e18322d4e6218bb4c8eb2e6ce49263d607a
2021-06-24 20:14:37 +00:00
TreeHugger Robot
cf4a21ede2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours am: 43314e95e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I295fc7568a795bbfc9d262dda902673d39c4355f
2021-06-24 20:14:32 +00:00
Bill Yi
3e45d30cfb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9e55bbaf2f5d03312deca10c09c21658eb7fb2d
2021-06-24 20:14:30 +00:00
TreeHugger Robot
8acff55c46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I864d92ebb5b96acfbfb11d67f69a11487a2841d9
2021-06-24 20:14:23 +00:00
TreeHugger Robot
bdf534d2c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic180a496da127ae4832a6e53591596ceb21d1dcf
2021-06-24 20:14:22 +00:00
TreeHugger Robot
717c2dc9c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 566af4c8b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb64d9e9135f6827af5d8ea671f1e34f407d4eac
2021-06-24 20:14:19 +00:00
Bill Yi
8068e3e113 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I704abc5fc36321a1c17d389e31c3f2fcff9dee23
2021-06-24 20:14:18 +00:00
Bill Yi
fb3e0ff793 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4328059d85cca375428226fb962bffe3141c06eb
2021-06-24 20:14:17 +00:00
TreeHugger Robot
43314e95e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7fce26fc05303b095d38f37ed2d47fcde834c66b
2021-06-24 20:14:09 +00:00
TreeHugger Robot
76a6621428 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcd09b7c0a3ab713a23fa91c239e617476f5e67e
2021-06-24 20:14:06 +00:00
TreeHugger Robot
0e1287502f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaea10d18ec08b69975f0f172e3b1fc282f8db64a
2021-06-24 20:14:05 +00:00
TreeHugger Robot
2067e288be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9a5c27355b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9714f9b77d23e3932f648d53fe56c4886c9ea298
2021-06-24 20:14:02 +00:00
Bill Yi
06ffb62957 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic10837a5f31ad798d1b9d43cadf6eb52300e4975
2021-06-24 20:14:00 +00:00
TreeHugger Robot
3fb4a97104 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ca62b8d0aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f69937d7673d2ac4e085bdf4e1609a39a17c5b2
2021-06-24 20:06:40 +00:00
TreeHugger Robot
e690d1c9ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f0708e90f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42202ee3f1cc9bda4992b7db492ef2db750cc245
2021-06-24 20:06:15 +00:00
TreeHugger Robot
566af4c8b9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-24 20:02:45 +00:00
TreeHugger Robot
9a5c27355b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-24 20:02:43 +00:00
TreeHugger Robot
483f978ba7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-24 20:02:41 +00:00
TreeHugger Robot
fa6b455bd0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-24 19:58:49 +00:00
TreeHugger Robot
edeef947e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 19:56:59 +00:00
TreeHugger Robot
1137b018f4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-24 19:54:30 +00:00
TreeHugger Robot
ca62b8d0aa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-24 19:51:09 +00:00
TreeHugger Robot
f0708e90f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-24 19:48:40 +00:00
TreeHugger Robot
190323d696 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 6916b17c04 am: c67736416d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I62c4072f7fde29a82bd0f696aa8f37aee55abae5
2021-06-24 19:13:28 +00:00
Zim
6699b47f77 Update string to enable transcode via MTP
Also added a summary string when checked.

Test: Manual
Bug: 191985287
Change-Id: I1db9763bbf3766eecace6eca168218ab71ca6195
2021-06-24 20:13:08 +01:00
TreeHugger Robot
d6ad62f047 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 15e4ca6442 am: e9d4220cfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I112d957fa6683eaac44394820baa07634e0583a2
2021-06-24 19:12:49 +00:00
TreeHugger Robot
c67736416d Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 6916b17c04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I439b5978c024cd1a7eed3620725aa4733e94a42c
2021-06-24 18:48:21 +00:00
TreeHugger Robot
e9d4220cfe Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 15e4ca6442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ic4ad40ca7669ba1a0890185c18e320f38e7b5ff9
2021-06-24 18:47:56 +00:00
TreeHugger Robot
fa6415f1d2 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 5c134ad624
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ie9a94e24909310b915f81a889a9ff3e0e48c0e7b
2021-06-24 18:47:32 +00:00
TreeHugger Robot
15e4ca6442 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ica9979965368a4aa9c42931441729290b6bd174b
2021-06-24 18:32:57 +00:00
TreeHugger Robot
5c134ad624 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I2a8343d2c07d916eb12c83dbe8bd6efa2f00df12
2021-06-24 18:32:06 +00:00
TreeHugger Robot
6916b17c04 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Id9ccc2ce6ca576f3949b1519019842201a2862de
2021-06-24 18:30:59 +00:00
Curtis Belmonte
2fb8f498ff Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: e3c31297b2 am: a64d135498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I75898b04c1414c791c0c2a2d6655c58e1a895451
2021-06-24 18:22:07 +00:00
Curtis Belmonte
1c90fdd2ce Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: 911fc6569b am: cc2b22c85d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: Ia321471296ec4db5bd6f13b7b17ecbde4c616445
2021-06-24 18:21:45 +00:00
TreeHugger Robot
dda37a3500 Merge "Updated fingerprint bad calibration string" into sc-dev 2021-06-24 18:12:11 +00:00
Curtis Belmonte
a64d135498 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: e3c31297b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I5834c4c4bb2d555cedb6cad78731c011fb82b475
2021-06-24 18:08:18 +00:00