Automerger Merge Worker
41712340ea
Merge changes from topic "am-1a61333c47d14652af20d83abbf57653" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -s ours am: 2fae3c8608 -s ours am: cda272683c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours am: 2819fde801 -s ours am: d36fa64c17 -s ours am: 6678d1b395 -s ours
2022-06-24 01:14:43 +00:00
Arc Wang
751cfa6326
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 7dd3084f1a -s ours am: ac35d1fba1 -s ours am: 4594cc7e8e -s ours am: 138d21059d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: Ic6df2254289f7ff8ee1f7b56a8e83c7c2a9e9af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:14:36 +00:00
TreeHugger Robot
d6449a7097
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -s ours am: 2fae3c8608 -s ours am: cda272683c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I2e50bb66877a81856eb1513a6e8ec325f280db59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:14:29 +00:00
Arc Wang
340f30ee6a
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours am: 56094f5a5e -s ours am: 643b9bde10 -s ours am: 9b9d3c42d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: Id3be0e2d04ab1b61c6d9ab113e63dac6f778fbe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:14:28 +00:00
Bill Yi
d382c93a41
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours am: 2819fde801 -s ours am: d36fa64c17 -s ours am: 6678d1b395 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: Id6577109f57e8ea0bed1baac21506708f7910987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:14:26 +00:00
Arc Wang
1a399e29e9
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours am: f6d30578b6 -s ours am: fc6f460183 -s ours am: a289705d0a -s ours
...
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Iec762a54982f4dad4d00c8132df8d708825d9b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:14:21 +00:00
TreeHugger Robot
24ec4dad49
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -s ours am: 2fae3c8608 -s ours am: abc26d38fd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I0887f45729580885507e5caa2e8c6101bb7d10f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:13:51 +00:00
Bill Yi
1b9fafa5a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours am: 2819fde801 -s ours am: d36fa64c17 -s ours am: 45908574e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I09e5836bbfe7bba1fa2870e428143a6e825e5c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 01:13:49 +00:00
Bill Lin
c51deb5ccd
Merge "Well control enrolling icon animation by UX design" into tm-qpr-dev am: 84154328df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034499
Change-Id: I3863cd9fd771e6392ece1a0a8ea7a758067c7ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:53:46 +00:00
Arc Wang
138d21059d
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 7dd3084f1a -s ours am: ac35d1fba1 -s ours am: 4594cc7e8e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: I613fa9cd976f288d4726a79d71557349e5c42b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:50 +00:00
Arc Wang
9b9d3c42d1
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours am: 56094f5a5e -s ours am: 643b9bde10 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: I31191547f3c69f33517154d2c0a0506b2998e4df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:45 +00:00
Arc Wang
a289705d0a
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours am: f6d30578b6 -s ours am: fc6f460183 -s ours
...
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I50dc030ff140b259a95f3f1d72185a31b813eac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:40 +00:00
TreeHugger Robot
abc26d38fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -s ours am: 2fae3c8608 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I00113b088499b3a6d2686eae5c1915ccc3b81a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:06 +00:00
TreeHugger Robot
cda272683c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -s ours am: 2fae3c8608 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: Icdab34d01bad748d63732b5a70c1f21a973aaca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:04 +00:00
Bill Yi
45908574e2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours am: 2819fde801 -s ours am: d36fa64c17 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: Iac02b759107d2ba2a53e0713e9b18bbfe286370f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:01 +00:00
Bill Yi
6678d1b395
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours am: 2819fde801 -s ours am: d36fa64c17 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I27baae14faa720d8fa2fc9f69d2900475aa6197d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:47:59 +00:00
Bill Lin
84154328df
Merge "Well control enrolling icon animation by UX design" into tm-qpr-dev
2022-06-24 00:41:10 +00:00
Arc Wang
4594cc7e8e
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 7dd3084f1a -s ours am: ac35d1fba1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: Idaa63bd6dfcfd29f5b3d5362bd7318026cedaf66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:31:12 +00:00
Arc Wang
643b9bde10
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours am: 56094f5a5e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: Icf37253d2a827c10d2b7d0588501f6f5c24c1500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:31:07 +00:00
Arc Wang
fc6f460183
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours am: f6d30578b6 -s ours
...
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I3a79373e8557f7d254c81f6e3e476841c06f289b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:30:32 +00:00
TreeHugger Robot
2fae3c8608
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: If55c036e66029f9f40366cb6fe05cf4f763be054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:30:19 +00:00
Bill Yi
d36fa64c17
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours am: 2819fde801 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: Idfb9cf3bc7e1208b7ad8ba011095695025e23555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:30:14 +00:00
Arc Wang
ac35d1fba1
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 7dd3084f1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: I85ce0fb7c6c80d140055a348a66373b2978116fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:06:29 +00:00
Arc Wang
56094f5a5e
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: Ie8c4b1bff4f405371c46810afac011d2655d92a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:06:21 +00:00
Arc Wang
f6d30578b6
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours
...
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Id338f4ffe6d94f2552281c47c5589739604c5fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:06:14 +00:00
TreeHugger Robot
7828afe859
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I29c94990fd4fd817084566ded10bb1bc851ebcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:04:10 +00:00
Bill Yi
2819fde801
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I09548afe761010b4909cc3a2453d1980776d6b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:03:59 +00:00
Automerger Merge Worker
4f3d8e074c
Merge changes from topic "am-07edb1ab4d2e477bb281d5830839cc6d" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 83da805299 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours am: d7343cd35b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: 4f950cb0f2 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: 968957026f -s ours
2022-06-23 12:10:26 +00:00
TreeHugger Robot
fe78464128
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 83da805299 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: Iad59b830d76eda577c824503e7a3f0d0b83261d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:09:53 +00:00
Bill Yi
ec26df1e09
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours am: d7343cd35b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: I4c5b90a581d18866c982dd85bc704a9da12f61b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:09:42 +00:00
TreeHugger Robot
1605b73f95
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: 4f950cb0f2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I1d25974d5c806ccbffc6946bca2c9d8ec9a75c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:09:37 +00:00
Bill Yi
7dfc2461cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: 968957026f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I10c391d3b4f9f17c0886a822fa9f0d9ba302ef97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:09:33 +00:00
TreeHugger Robot
4416ef349a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 9812f35a1b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: I3469720c2b2d793a66057e3e53b105d91946d376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:09:13 +00:00
Bill Yi
b6117e10c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours am: 679b231989 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: I99d7ff3b972f8a4811ba36bf2abe8a970cc0033d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:09:06 +00:00
TreeHugger Robot
096942d9ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: d360cd6895 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: Idd7b333ecc505d491261e0916e994b9ec759cd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:08:58 +00:00
Bill Yi
28b04115ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: f1ccac59de -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I6821a13cff8548a35afa61b86eb9fe328c50dc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:08:49 +00:00
TreeHugger Robot
9812f35a1b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: I016a862b42c0563e77b78a84dda730514a25ee7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:46:20 +00:00
Bill Yi
679b231989
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: Ic02005a0bb378e5e4916e094bc5d1cd2fc1bf201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:46:11 +00:00
TreeHugger Robot
d360cd6895
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: Iee8fd197446401293b649fb866fca45375b14892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:46:03 +00:00
Bill Yi
f1ccac59de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I07e7a8739655acb12d360200de06e1579aa3355e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:57 +00:00
TreeHugger Robot
83da805299
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: Icf109cb516d4707651889218440e6505c1c7a2a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:34 +00:00
Bill Yi
d7343cd35b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: I3208b65b9ae16f865ea4f77029a8d0bd741ec55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:28 +00:00
TreeHugger Robot
4f950cb0f2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I4aceec2f0ed1e39fd5974f9085f71f47b6244d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:17 +00:00
Bill Yi
968957026f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I64789bcb06aecccdbfe6a9feb0bbfd2e2e1833f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:10 +00:00
TreeHugger Robot
49a681bb37
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-23 11:24:26 +00:00
TreeHugger Robot
f08bf7780a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-23 11:24:26 +00:00
lbill
48286b8df0
Well control enrolling icon animation by UX design
...
T:
* Always plays the scanning animation when user enrolling.
QPR:
* At beginning / Orientation change: Play the scanning animation until user interact with FPS
* When progress moved : Play scanning animation once
* Error : Show message(red color) to notify user
Bug: 232018092
Test: With Rare-FPS device, Settings > Security > Fingerprint enrollment,
enrolling a new fingerprint, check the mIconAnimationDrawable
Test: With Side-FPS device, Settings > Security > Fingerprint enrollment,
enrolling a new fingerprint, check the mIconAnimationDrawable
Test: make RunSettingsGoogleRoboTests ROBOTEST_FILTER= \
"com.google.android.settings.biometrics.fingerprint.FingerprintEnrollEnrollingTest"
Change-Id: I64a1bd24260205b651036c34e6e879b59bef75cc
2022-06-23 08:33:02 +00:00
Bonian Chen
b27361686a
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: 2cb39cf969
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: Iaf9d3e3d082f576fb58d54de59154cc79ac6a917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 05:08:24 +00:00
Bonian Chen
91c1a023e3
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 am: fef8aab672
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: Ieab524093fcf79f22ea57b6fd1989eb6b5351f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 05:01:18 +00:00
Bonian Chen
0805e9efbf
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: I321210e16c994d86824d952d04e7bb9a98e462d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 05:00:56 +00:00