SongFerngWang
c69ee75a64
[Setting crash] The dialog is null am: 8514ff65eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Ib697f1fddcb8b77b36d2dc95cfa34331ded9bf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:06:56 +00:00
SongFerng Wang
2ab5c395ac
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: I5259dc6fffa80297f28fb0341309d0254940d0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:06:04 +00:00
SongFerngWang
a49335241a
[Setting crash] The dialog is null am: 8514ff65eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: I287c5f4bbaed7739b07b3f9ed50b229061f994e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:05:44 +00:00
SongFerng Wang
40379dd9d4
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: I6120361d42db676e02991dafd707dfa1b4188777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:05:41 +00:00
SongFerngWang
b6bd4143cd
[Setting crash] The dialog is null am: 8514ff65eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Ie9e4e661bb66dcb898b2f98435989ab838d37713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:05:21 +00:00
SongFerng Wang
be1b37ae2b
Merge "Unable to enable the removable esim" into tm-dev
2022-06-09 01:30:44 +00:00
Joshua McCloskey
0eb278b245
Added consent message for FaceAuth enrollment.
...
Test: Manual.
Fixes: 234663447
Change-Id: Iefd9b10eb634ed271f57b82e2a40be08dbbc1f61
2022-06-08 22:02:19 +00:00
Bill Yi
d98e536863
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I650e4197e0aff594a172c01f04cffd4092b7467d
2022-06-08 14:12:47 -07:00
Bill Yi
fe71b2e76c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
Bill Yi
bae003932e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0551317a60356a451fc2001bc1db2c368140a7ba
2022-06-08 14:05:47 -07:00
Bill Yi
28e9f3fed0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4252cc2a783ef050a480c1b08c1954afcdd58d12
2022-06-08 14:01:41 -07:00
Joshua McCloskey
548f6f36c1
Add functionality to restart fp enrollment.
...
Test: Tested manually via SUW that restarting enrollment works
as expected.
Test: Tested manually via settings that restarting enrollment
works as expected.
Fixes: 234887288
Change-Id: I815392269da786d2dfd157267919a09281af6277
2022-06-08 21:00:59 +00:00
Joshua McCloskey
77452db3f9
Updated FP enroll confirmation string
...
Test: Verified correct string shows after FP enrollment.
Fixes: 234183906
Change-Id: I57e7ce836d4dc5ad2caf198aa59738f64dc4c049
2022-06-08 20:59:36 +00:00
Bill Yi
477cf091a1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-06-08 14:34:42 +00:00
Bill Yi
88b1472a6a
Merge changes from topic "tc_change_22060715_4"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6a7e3fc8dd
Import translations. DO NOT MERGE ANYWHERE
2022-06-08 14:34:42 +00:00
SongFerngWang
8514ff65eb
[Setting crash] The dialog is null
...
Add the null protection.
Bug: 235267673
Test: build pass
Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19
2022-06-08 08:32:05 +00:00
Milton Wu
2069d2e17b
Update SUW fingerprint string
...
Bug: 228021544
Test: Check string in SUW flow
Change-Id: Id0729b7f2758e98d53484ffd35282c6423f82262
2022-06-08 07:12:24 +00:00
Automerger Merge Worker
8325500238
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours" into tm-d1-dev-plus-aosp am: 2775ad9caa -s ours am: 1a935b1953 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Id9b06a1d580d122ca5fe13f0a64e1a5190e104be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:35:37 +00:00
Bill Yi
5d74ca40f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours am: 2b0376c226 -s ours am: 5e0ce2dca3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Iee9ecfcb9ec8d1c04c1ee81dbdd1cfbb53791e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:35:20 +00:00
Bill Yi
8a4d954d9a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 131903dd2e -s ours am: 17fe543e54 -s ours am: a1ae687480 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I3571b9c2621ee3c879ff7a4257de707af331f433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:28:05 +00:00
Avinash Vadlamudi
73daf8510f
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev am: 26e3744221 am: 1ed3556c63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18751036
Change-Id: I8f024e7a0a13a07357082d78f015ecfa696b9d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:26:05 +00:00
Automerger Merge Worker
1a935b1953
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours" into tm-d1-dev-plus-aosp am: 2775ad9caa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I3b7720ae178ab43f99349ed75368fdcf157e76ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:22:32 +00:00
Bill Yi
5e0ce2dca3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours am: 2b0376c226 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I2c8e880853e6f9cde41103f0a3a5945305a63977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:22:10 +00:00
Bill Yi
c6c0a33d9c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours am: c4a1f97025 -s ours am: 6d96a79850 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I82cb7f56ac155628fd427d215d3ae60f35d7a9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:16:59 +00:00
Bill Yi
a1ae687480
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 131903dd2e -s ours am: 17fe543e54 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I89901a3b8ec9d062e0cbca00a8a48d52e172b362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:14:42 +00:00
Avinash Vadlamudi
1ed3556c63
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev am: 26e3744221
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18751036
Change-Id: I1a0e8f88302132e700c9f07b802f44e412ceae1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:12:18 +00:00
Avinash Vadlamudi
26e3744221
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
...
* changes:
Rename method for better readability
Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
Bill Yi
6d96a79850
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours am: c4a1f97025 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I48b082d485ba11bd56a8a469d1c430dcc392044f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:57:31 +00:00
Automerger Merge Worker
2775ad9caa
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours" into tm-d1-dev-plus-aosp
2022-06-08 03:50:41 +00:00
Bill Yi
42420e4d1f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 04b439f643 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I899a973f1062c659608173ba8d393cb67573239c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:49:30 +00:00
Bill Yi
2b0376c226
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I3ce5bb254a6c4d9244c2f29c3a6ad59587438753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:48:49 +00:00
Bill Yi
17fe543e54
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 131903dd2e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Ib4af0ce054ac96742875fcd2df1a28d163e691dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:48:41 +00:00
Bill Yi
c4a1f97025
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Ic7cf3d05fe64e8e19bfc950365e3d210155a76dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:48:30 +00:00
Bill Yi
131903dd2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Icd6cc592217548df11b658f141d8dee124e99b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:47 +00:00
Bill Yi
537b47d74e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: Ie56499fb898021c83535e0db7f0552c9400e7956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:43 +00:00
Bill Yi
04b439f643
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I6157b0172eca6b502973a9fc653fae093518edeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:23 +00:00
Bill Yi
4314b79c07
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6a7e3fc8dd
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774215
Change-Id: Ia70db1d311f37bdb567a20b8655e6fdd67fdc37d
2022-06-07 22:40:42 +00:00
TreeHugger Robot
193f799f88
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev am: 909b62ffa4 am: 0b79b0831d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740330
Change-Id: I241fe9546575df2d978a360f906116feffd50de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 18:53:53 +00:00
TreeHugger Robot
0b79b0831d
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev am: 909b62ffa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740330
Change-Id: Ida08053974615bb1200e20b6f90ca0adbc79d4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 18:36:21 +00:00
TreeHugger Robot
909b62ffa4
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev
2022-06-07 18:16:32 +00:00
Ronish Kalia
9e4f2478dc
Merge "Add support for directly opening ringtone picker"
2022-06-07 16:15:18 +00:00
Ronish Kalia
8d224da75c
Merge "Add support for launching user edit dialog"
2022-06-07 16:13:16 +00:00
Bill Yi
e6b9e1fdf5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Bill Yi
6a7e3fc8dd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I490033f7244d12463519754330d8ff76c5753005
2022-06-07 07:21:14 -07:00
Zhe Song
90c02742e6
Merge "Fix AVAILABLE constant to be search indexable for Enhanced Notification."
2022-06-07 11:21:43 +00:00
Chaohui Wang
a57a41c0db
Merge "Clean up unused PreviewSeekBarPreferenceFragment"
2022-06-07 10:08:24 +00:00
Automerger Merge Worker
588d5db985
Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524" into tm-d1-dev-plus-aosp am: 2de1730ca0 am: 2a3e6630ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: Ida42fc01d7d170204177bb0e395665f66733a21b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:31:04 +00:00
Edgar Wang
dfe3692258
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 025baa318b am: 0d22bf453d am: 65d4e5ffef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: Ia96136f5c3f44b8ead75c8d7d2c0ba1d5a27f577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:30:56 +00:00
Edgar Wang
fe601c0489
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524 am: 7ab5a44498 am: 94a7906033
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: Iaf9e24ca15aa94241c07db97c2b0d11881328e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:30:48 +00:00
Automerger Merge Worker
2a3e6630ae
Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524" into tm-d1-dev-plus-aosp am: 2de1730ca0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I33d0be2302813faf76949efdc869cdcb0eb7c296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:12:42 +00:00