TreeHugger Robot
8be819762f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-09 02:39:03 +00:00
SongFerng Wang
be1b37ae2b
Merge "Unable to enable the removable esim" into tm-dev
2022-06-09 01:30:44 +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
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
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
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
b398e5434c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8ff8e957617656c81494a816c9e18a4efbd4ed14
2022-06-07 07:17:14 -07:00
Edgar Wang
1f6334825f
Merge "Recalculate view's height when tab is selected" into tm-dev
2022-06-07 04:17:39 +00:00
TreeHugger Robot
3de5617a68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: I7a89dc3c0ffad10dec24003198409aad5b174182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:21 +00:00
Bill Yi
2036b1873c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: I57a2a0dcb836119e48d63874ec6ed77715cab344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:17 +00:00
TreeHugger Robot
722272143c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: Ic3a2da03399dc35e01360df7c323cb3b5b68808c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:10 +00:00
Bill Yi
26d22ef04d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: I1286629b18bae7a7a76bd4c96fc3b3d33cf559db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:00 +00:00
TreeHugger Robot
725c53880a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-06 22:36:20 +00:00
TreeHugger Robot
e852811d18
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-06 22:36:20 +00:00
TreeHugger Robot
6769eee779
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-06 21:03:12 +00:00
TreeHugger Robot
21b98d4cbf
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-06-06 18:41:19 +00:00
TreeHugger Robot
fc5802934b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-06-06 18:41:19 +00:00
SongFerngWang
64430ba2d2
Unable to enable the removable esim
...
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.
Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-06 17:56:25 +08:00
Raphael Kim
a2b94beca8
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
am: 8da96d69dd
-s ours am: aa31e245ab
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Ib29e5d311bf6f13e6ecc06d55d72a56c2d93e246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:53:57 +00:00
Raphael Kim
aa31e245ab
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
am: 8da96d69dd
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Icfb23e771f8b8c77ca426f5c448227b6181cf72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:32:35 +00:00
Raphael Kim
fbfa9e2df7
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I8e0a51ca890273ffa537f3e94372ba48a8e715d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:15:46 +00:00
Raphael Kim
8da96d69dd
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I5ba1ef5a3a708c14b9fb739753e83d923b98b1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:15:08 +00:00
Raphael Kim
6d5ea9e89a
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Ie914a7dc51267245d8f7f919b1ed68040032fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:00:18 +00:00
Raphael Kim
d6353487cf
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I3825280fafc93e56ef239bf70d72b0bb56544f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:50:25 +00:00
Raphael Kim
84bafc9fda
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I13426af81ec5970befc29118f883a08d28c8a986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:32:26 +00:00
Raphael Kim
839ce544aa
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Ic145c489bd89fbc822ee48bfc14193c62321d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:14:41 +00:00
Raphael Kim
94683c61b1
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev
2022-06-05 01:54:28 +00:00
Bill Yi
106e52ca92
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I052e09e19a9d145d401e0152346ebe7f0e7f2a36
2022-06-04 01:26:51 -07:00
Bill Yi
96fda27ccb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b60a0fb4183522545dcf50eae9cd8f1f38a6c1d
2022-06-04 01:23:16 -07:00
Bill Yi
d3dc439a10
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idbd661c3b6a62971ef7ee40430437aac416cccdc
2022-06-04 00:58:31 -07:00
Bill Yi
c36c8eef75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7907d46ed6cd5416548da57698f32a344f83ba7a
2022-06-04 00:40:55 -07:00
Bill Yi
379c2f0774
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I965dcde2e137479f7a30733f635b8cfd466c93ad
2022-06-04 00:36:26 -07:00
Arc Wang
1d71f3e2af
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours am: 1732408586
-s ours am: a80076e2f3
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I410e4b0ff40a7e9ab5922b4542314b09e7e2dea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:33:32 +00:00
Tsung-Mao Fang
e025e77430
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours am: 2abeb254ea
-s ours am: 9c070af470
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ibbc64f16dd0303d4ca59a321486e1bb16b934654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:33:30 +00:00
Arc Wang
d1135c52b3
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours am: 7c863fb69d
-s ours am: 4560b69963
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: Icdc188bafc752618012a111427f1d72cd0710002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:33:28 +00:00
Arc Wang
a80076e2f3
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours am: 1732408586
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I66eb46b7f25b9d3bc772ed945751858d503f9574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:26 +00:00
Tsung-Mao Fang
9c070af470
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours am: 2abeb254ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I3aef9cb7abcb044840d5d56ab5c79679920529cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:25 +00:00
Arc Wang
4560b69963
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours am: 7c863fb69d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: I19a2734d15b42047dcae7efad291d1ce51c633d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:24 +00:00
Arc Wang
a58d975aa0
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I42266740061fa033f0afcf4db78ce1286787fb0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:52:15 +00:00
Tsung-Mao Fang
ecde630b9f
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Idd99fb3629834a7f3b29fa7a58e22b5ce41f6d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:52:13 +00:00
Arc Wang
e6135eeb89
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: Icb142b68c43cf6e3901e2f33e4129c7723fec68e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:52:12 +00:00
Arc Wang
1732408586
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I44ab9fffbeada73003e5876eeb83f2cc07c7928e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:51:32 +00:00
Tsung-Mao Fang
2abeb254ea
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I3d7f8e78b6d9febcd06c7d84cc5c560b442ae294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:51:31 +00:00
Arc Wang
7c863fb69d
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: Ie9bd953a9c613770fc12c121fdc155ee8b1aecaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:51:30 +00:00
Arc Wang
ab3adbd4dd
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I6a43ef0a5d3be0ccea94ff04b6ef83bca00981b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:35:34 +00:00
Tsung-Mao Fang
2e3f8a30a1
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ied5f7df1a6f1e1f53a07dadcd828d8042a677c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:35:32 +00:00
Arc Wang
4129c273cc
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: Ia6a7f76c885e08cbf388bbd912b08f481ae23575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:35:29 +00:00
Arc Wang
12f11b0683
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I5641668bddf5f94f95c0cfa59c7e5c2761bc8c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:10:35 +00:00
Tsung-Mao Fang
2a665430e2
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ic1399368e6286da4d3406faa019b4b6c86f4011f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:10:34 +00:00