Automerger Merge Worker
e614fd781c
Merge changes from topic "am-619ea875108a44d7b91bdc1543c31952"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c2314389d95faadcfdd95a8a7c899d855e12dd0213cd68431eb96784f
2023-06-21 06:56:14 +00:00
Automerger Merge Worker
08c72453e8
Merge changes from topic "am-a0cf920a5fac4d7a8c21e8f7c823c54b"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c2314388287f6dd2edd95a8a7c86ddbc5e6bed0213cd6843ecb491af2
2023-06-21 06:52:48 +00:00
Treehugger Robot
02ebf5bb7f
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 am: 7abcb94693 am: 0105ea3228
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: Ic8e351d21181bd245e8a14fa4f6c0ff6a2de2f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:52:29 +00:00
Treehugger Robot
fce65cc90c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 9d95faadcf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I18ca3172ad729e381c8f7481c9d790e7c325ae83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:51:08 +00:00
Bill Yi
d34eb75169
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: 99d855e12d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I60033c054cb5c20be10dbb6b4c1b7b351eee8aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:50:55 +00:00
Bill Yi
c31fe4630a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 31eb96784f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: Ib495dd58073fdf0cfa11a093607bcb56a9cd27eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:50:39 +00:00
Treehugger Robot
ce90dc57a6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 8287f6dd2e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I0c297a4daf0ea1bf730b5eadf7f15f35c13bfcde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:50:29 +00:00
Bill Yi
f0d72caf4f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: 6ddbc5e6be -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I07f2f39f0f7135ba2e4b72b38b74b4297306b00f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:50:19 +00:00
Bill Yi
e6dff5c804
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 3ecb491af2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: Ib180c0b2f9a95902d18a6c399a51af3f4dcf47f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:50:00 +00:00
Treehugger Robot
8287f6dd2e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I7a4e67426ddf14b771962c356e1a629a12401934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:37:02 +00:00
Bill Yi
6ddbc5e6be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I7c9097d1415a6163ad859ea747049eeaec25861e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:56 +00:00
Treehugger Robot
9d95faadcf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: Ida72cb381d7846e1a5a2ff4d62b790d15ffbc8c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:34 +00:00
Bill Yi
3ecb491af2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: I333952a9b0a5ee8f37b620f38a122f9bde4d5125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:31 +00:00
Bill Yi
99d855e12d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: Ib7dd3dbbf533a171c6a8ce4a782ed34583a27b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:29 +00:00
Bill Yi
31eb96784f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: If611b97ae73bba5cf7a1db9cacb0cedf4c966781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:04 +00:00
Treehugger Robot
8e3c231438
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-21 06:19:35 +00:00
TreeHugger Robot
201af568d8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c -s ours am: 1bc160c342 -s ours am: 5eb79cef8c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I564b7cf5d8f57061ce55c8698f7a3d6355917542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:51:07 +00:00
Bill Yi
9bd02e4078
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff -s ours am: 48534e61a8 -s ours am: 4b303c23bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: Ib5c16baf76a8409eda6b37f3f8cf72e6c6810117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:50:59 +00:00
TreeHugger Robot
4b121489d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b -s ours am: 636c7ba7c1 -s ours am: fa3f43793d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: Ifadaaa9e524ca7a93a0e11390c67f36033e9b1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:50:54 +00:00
Bill Yi
e21694440e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd -s ours am: 133e504b7e -s ours am: 85728f90a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: Ibfdee1cd6e96b52f41091aa4fab4e6f3b4ff29b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:50:28 +00:00
TreeHugger Robot
377dcb5122
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22 -s ours am: 9d9a674b40 -s ours am: 305d40b7cc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: If899bd8e5732731ca74aefdee2d20e12c8c5c4fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:50:06 +00:00
Bill Yi
5db711f977
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3 -s ours am: f859b36ddb -s ours am: 2de76698bd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: I0395fa9f6f653926e47b1a1af13d78a64e575db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:49:49 +00:00
Treehugger Robot
ef957eda5a
Merge "[BiometricsV2] Refactor EnrollingRfpsFragment"
2023-06-21 04:55:47 +00:00
Treehugger Robot
2c75f0e207
Merge "[BiometricsV2] Refactor FindSfpsFragment"
2023-06-21 04:55:43 +00:00
Treehugger Robot
a9aca48fcf
Merge "[BiometricsV2] Refactor FindRfpsFragment"
2023-06-21 04:55:36 +00:00
Bill Yi
dd95a8a7c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c3068ef9ae4cfd121798c3247328a8ebaadf22a
2023-06-20 19:30:31 -07:00
Bill Yi
d0213cd684
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7725eba9eba2160e5a330d92a312f45d677b91a7
2023-06-20 19:28:50 -07:00
Milton Wu
75450f7973
[BiometricsV2] Refactor FindSfpsFragment
...
Refactor FingerprintEnrollFindSfpsFragment to kotlin and add bindView()
method for it
Bug: 286197831
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Side fingerpint device
Change-Id: If1c7d95e78c5be237f05209afa3ffc0b4c444c61
2023-06-21 09:56:32 +08:00
Milton Wu
00bafe9f64
[BiometricsV2] Refactor EnrollingRfpsFragment
...
Refactor FingerprintEnrollEnrollingRfpsFragment to kotlin and add
bindView() method for it.
Bug: 286198028
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Rear fingerpint device
Change-Id: Ie271386f305003a89d7e545c289e47bbafb14a90
2023-06-21 09:54:55 +08:00
Milton Wu
ada229b409
[BiometricsV2] Refactor FindRfpsFragment
...
Refactor FingerprintEnrollFindRfpsFragment to kotlin and add bindView()
method for it
Bug: 286197313
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Rear fingerpint device
Change-Id: Ifa11888f3e848fb7127e14ddcc41d02277163a1a
2023-06-21 09:52:35 +08:00
Julia Tuttle
d68cf98dc7
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4e6fecc6d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I19e4f1cd8664cb6483110b8373d68f4a73977e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:51:38 +00:00
Julia Tuttle
1ddbbd4542
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 2390428dd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I62ce7d8d02d54605e3115ed3abd7583ad05010be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:48:39 +00:00
Julia Tuttle
2390428dd8
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Iaf0c32fc2ff4450dadc2256601d6966e5bd73d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:19 +00:00
Julia Tuttle
4e6fecc6d7
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I70c6b9024fe1cbb7cf37bfea71225a8bebe5df50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:04 +00:00
Julia Tuttle
bd74e47e5e
Merge "Fix colors in importance and conversation priority preferences" into udc-dev
2023-06-20 16:21:01 +00:00
Automerger Merge Worker
cea910f8ae
Merge "Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 0d8db71d44"
2023-06-20 07:46:48 +00:00
YK Hung
3a04e20f39
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 94f5c7a913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I825b76d4c744ed5edc2ce4732d120f44b40fb0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:46:39 +00:00
YK Hung
fdfce46f25
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 0d8db71d44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: Ia1122a31159b6a3fe6613ba39c575598635a5e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:46:39 +00:00
YK Hung
0d8db71d44
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I3158ea89ef2804c5a9878ff27db5b9b4466e0644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:05:48 +00:00
YK Hung
94f5c7a913
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I3b226770289800cec4196a6b34ceb05f090a6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:05:34 +00:00
YK Hung
a4f67e02c8
Merge "Update tablet help article link (1/2)" into udc-dev
2023-06-20 06:34:46 +00:00
TreeHugger Robot
7f45861797
Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call"
2023-06-19 05:20:22 +00:00
TreeHugger Robot
bf296dc1bd
Merge "[BiometricsV2] Refactor Fingerprint intro fragment"
2023-06-19 02:16:22 +00:00
Chaohui Wang
af3f8ce6dd
Merge "Clean up Settings_srcs & Settings_manifest"
2023-06-18 04:07:47 +00:00
Milton Wu
8e42d7c85a
[BiometricsV2] Refactor Fingerprint intro fragment
...
Refactor FingerprintEnrollIntroFragment to kotlin and add bindView()
method for it.
Bug: 286197823
Test: atest FingerprintEnrollmentActivityTest
Change-Id: I44157bf2c2bea6f49382335438b16aae3e3e5b4c
2023-06-17 18:16:17 +08:00
Treehugger Robot
0105ea3228
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 am: 7abcb94693
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: I6f89faee0e5acc08dfb6b9d63e6def80367b43a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:46:31 +00:00
Treehugger Robot
7abcb94693
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: I2cc82b781919c303a70bcdb39c162d5a68fa7e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 07:01:44 +00:00
TreeHugger Robot
5eb79cef8c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c -s ours am: 1bc160c342 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: Ib0c728b5ef5b783e5c713622a78de6fe2ae5f66e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:40:50 +00:00
Bill Yi
4b303c23bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff -s ours am: 48534e61a8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I791a55f652eb93e20929a9bbf7c2acef5e39dc67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:40:46 +00:00
TreeHugger Robot
fa3f43793d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b -s ours am: 636c7ba7c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: I32bc3a02e901ec5103dc0015a29ef383832f6076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-17 06:40:39 +00:00
