SongFerngWang
e9d39b468d
[MEP] renew the default data selection UI am: db2ddb6a92
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026
Change-Id: I8854b721cc74a33071abaa2ff76a8e3428174c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:44 +00:00
SongFerngWang
b29d670c71
switch SIM refactor to support MEP am: 59a6ecbde2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025
Change-Id: I5747bf7dec160d081f4cb2c69f60173c9d4dd6e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:42 +00:00
SongFerngWang
483ff27a47
switch SIM refactor to support MEP am: 37358798bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024
Change-Id: I9ede4062566e48899eb79ff12e5e4cd96b01ddba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:41 +00:00
changbetty
342fe3487e
Support RTL mode in Sim switch dialog am: 562cc5ed45
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023
Change-Id: I67e4a9aa874b0a103c5c06863d42826f8f0a3a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:40 +00:00
SongFerng Wang
31c40b00e7
Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ...
...
* changes:
[MEP] disable enabled esim profile before set simSlotMapping
[MEP] renew the sim confirm dialog UI
[MEP] renew the default data selection UI
switch SIM refactor to support MEP
switch SIM refactor to support MEP
Support RTL mode in Sim switch dialog
2022-03-27 14:44:48 +00:00
Bill Yi
62dc714628
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3193111a9c76984dfdf2310f67908ebed6a203b5
2022-03-27 04:11:37 +00:00
Bill Yi
38de1eab21
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4726fdf933dfe2ae0f53a7f105925a42e5ce6909
2022-03-27 04:07:52 +00:00
Bill Yi
9e58dde841
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iace08c34ff96cd8eca6a9fdb99be5a3cc61bde27
2022-03-27 00:00:55 +00:00
Bill Yi
e4b50ee2d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifb7ddd4639b4f9042ea3d04ce7f3175d3e7a4a85
2022-03-26 23:57:15 +00:00
Peter Wang
6879183335
Add a cancel string for ToggleSubscriptionDialog to handle Tamil
...
translation
Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
2022-03-26 15:12:14 +08:00
Joe Bolinger
8ff1ef339f
Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Set exported flag to false. 2p: 34704f4108
Set exported flag to false.
2022-03-25 22:20:22 +00:00
SongFerng Wang
b88a4a8830
[automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb
-s ours am: 8030d66e0d
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043033
Change-Id: Idde31132a2048ef90cec19ff03a92f7f07ab33df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:33:54 +00:00
Peter Wang
16f75f0c64
[automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c
-s ours am: 810677e214
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043033
Change-Id: Ibd4121e43ccc3277e10815557f4b7ab61fa8245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:33:53 +00:00
SongFerng Wang
83a12cf22c
[automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9
-s ours am: 5dea8d562f
-s ours
...
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043032
Change-Id: I2f85174fe753165f835e2c7ea54c8af81ac10259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:33:35 +00:00
SongFerng Wang
04bd163a85
[automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4
-s ours am: 9c1f66d741
-s ours
...
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043032
Change-Id: I86d331986ee63559ac9746c2c5394b11b67c178d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:33:33 +00:00
SongFerng Wang
8030d66e0d
[automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043033
Change-Id: I83bf260cf7a13e430d05ff0bdd853d039f14db61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:05:46 +00:00
Peter Wang
810677e214
[automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043033
Change-Id: I3ed72e07a176e34346d59459f0099f165389e34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:05:45 +00:00
SongFerng Wang
5dea8d562f
[automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9
-s ours
...
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043032
Change-Id: I04b09953f289daa0f1c523577baecfa186753329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:04:53 +00:00
SongFerng Wang
9c1f66d741
[automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4
-s ours
...
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf
is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043032
Change-Id: I646ffb450b7d74774ce1d2c322006521efd80593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:04:50 +00:00
SongFerngWang
cd6c83ac8d
[MEP] Use switchToSub API with pending intent
...
It is based on the framework refactor. ag/16494924 Framework
changed the API, so here modifies it.
Bug: 205504646
Test: WIP manual
Change-Id: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
Merged-In: I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205
2022-03-25 17:04:42 +00:00
SongFerngWang
eaec059551
[MEP] disable enabled esim profile before set simSlotMapping
...
This is the modem request to disable enabled esim profile before
set simSlotMapping.
Since the framework still do API refactor ag/16494924. The
switchToSub API will be changed, so here modify two callback.
the one of callback will be removed after the framework complete
the API refactor.
Bug: 210063749
Test: Build pass. Local test: do sim switch in SS mode and DSDS mode.
Change-Id: Iee650897b81c96b5febb0413649629b1a1971b18
Merged-In: Iee650897b81c96b5febb0413649629b1a1971b18
2022-03-25 17:04:33 +00:00
SongFerngWang
ba9d26696b
[MEP] renew the sim confirm dialog UI
...
- renew the sim confirm dialog
Bug: 199902896
Test: build pass and local UI test
Change-Id: Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20
Merged-In: Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20
2022-03-25 17:04:24 +00:00
SongFerngWang
db2ddb6a92
[MEP] renew the default data selection UI
...
- renew the default Data/Call/SMS selection
Bug: 199902896
Test: build pass and local UI test
Change-Id: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
Merged-In: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
2022-03-25 17:04:15 +00:00
SongFerngWang
59a6ecbde2
switch SIM refactor to support MEP
...
To create new dialog for MEP. It is a simple UI for testing,
not the final version.
Bug: 199902896
Test: local build pass.
Change-Id: Ief4299e775c0758e4b886d5eff13bd482f8c8ab3
Merged-In: Ief4299e775c0758e4b886d5eff13bd482f8c8ab3
2022-03-25 17:04:04 +00:00
SongFerngWang
37358798bc
switch SIM refactor to support MEP
...
1. Using new telephony API and doing the code refactor
2. To support multi esim profiles case
Bug: 199902896
Test: local build pass.
Change-Id: I8580022793e5c3fc14159f14b406f864353477f8
Merged-In: I8580022793e5c3fc14159f14b406f864353477f8
2022-03-25 17:03:55 +00:00
changbetty
562cc5ed45
Support RTL mode in Sim switch dialog
...
Screenshot: https://photos.app.goo.gl/QuDrFzBSzog1F7Gf7
Bug: 189955098
Test: Manual Test
Change-Id: I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a
Merged-In: I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a
2022-03-25 17:03:25 +00:00
SongFerng Wang
7ba3e20afb
Merge "Add a cancel string for the dialog to handle Tamil translation"
2022-03-25 17:02:53 +00:00
Peter Wang
aa042c2d6c
Add a cancel string for the dialog to handle Tamil translation
...
Bug: 185553806
Test: Build
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Change-Id: Ie8e9d150bf7868b462176c5cb5ed65beb187cc0e
2022-03-25 23:54:22 +08:00
SongFerng Wang
02db0438a9
Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil""
2022-03-25 15:34:32 +00:00
SongFerng Wang
0f77d567b4
Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"
...
This reverts commit 9ecda98ada
.
Reason for revert: It should not add"Merged-In: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9", so do revert and CP it again.
Change-Id: I6c62e2a02e62f16c45771daee5040753ab14a4b8
2022-03-25 14:03:29 +00:00
SongFerng Wang
4228fc731e
[automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee
-s ours am: dece925261
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030
Change-Id: I04578279fe1e9262b9000e2652265771d88bee92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:11:58 +00:00
Peter Wang
35099dc4a5
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada
-s ours am: 5ee56fb6f8
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030
Change-Id: Ie2574129cd6603bf90d7ffdd32e302b3c8abf79f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:11:56 +00:00
SongFerng Wang
dece925261
[automerger skipped] Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation" am: d71406f8ee
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030
Change-Id: I9484599eba7ddacad002343cd22a9476afecff3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:47:29 +00:00
Peter Wang
5ee56fb6f8
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030
Change-Id: I160a5eeac58e392bb9eaabc9831354c79fca21e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:47:28 +00:00
SongFerng Wang
d71406f8ee
Merge "Add a cancel string for ToggleSubscriptionDialog to handle Tamil translation"
2022-03-25 09:28:56 +00:00
Peter Wang
9ecda98ada
Add a cancel string for ToggleSubscriptionDialog to handle Tamil
...
translation
Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
2022-03-25 00:41:05 +00:00
Joe Bolinger
200707c7cd
[automerge] Set exported flag to false. 2p: 34704f4108
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185
Bug: 222684510
Change-Id: Ieb28cc08edd9027734c4ed40e0fe083b50360964
2022-03-24 18:31:09 +00:00
Joe Bolinger
34704f4108
Set exported flag to false.
...
It was set to true when the attribute became required in I878adb9108c95f06ddd059b23a542b61210edfa4
Bug: 222684510
Test: manual (see bug)
Change-Id: I8f67a5c3ac92f4813dc503cada8888833d7dbfbf
2022-03-24 18:31:01 +00:00
Bill Yi
21377c29a1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 752d4d5d72
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17354823
Change-Id: I6b29a66c010bf94a5d2aeb1921948231f3283d81
2022-03-24 15:48:04 +00:00
Bill Yi
d96b66598b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2bd7d9886
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17354823
Change-Id: Id0763fa2379eb008db7ff39ba8bd781b0fcc18f2
2022-03-24 15:47:57 +00:00
Bill Yi
752d4d5d72
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-03-24 15:30:38 +00:00
Bill Yi
e2bd7d9886
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie196fdd648f8d7e1df21cd7323aa851d164db6c2
2022-03-23 18:22:15 +00:00
Bill Yi
5a15b32995
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2aacc0aac
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17354410
Change-Id: I3a298ec797195f9f7240b4c51c26657d91f4e764
2022-03-23 18:09:34 +00:00
Bill Yi
a2aacc0aac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifea2ae405190a88de4e795fd91ec426f7cea3be5
2022-03-23 18:09:25 +00:00
Gary Jian
24888461da
Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9
am: 41ec2bc89b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223
Change-Id: Icbe95d63e86ef204fec957757a8f8b49ef77ac82
2022-03-23 06:34:55 +00:00
Gary Jian
41ec2bc89b
Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026223
Change-Id: Ia08609cddc63034e3f9d02f64727d92fe9e2348f
2022-03-23 06:11:41 +00:00
Gary Jian
78b2b241a9
Merge "Add a developer option to controll mockmodemservice permission"
2022-03-23 05:46:22 +00:00
SongFerng Wang
eefaf62ba7
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
am: 285952a80e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: Iabc7d3cf66470bd96c2b5caac2469eac888b2ae2
2022-03-23 02:34:07 +00:00
SongFerng Wang
285952a80e
Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423
Change-Id: I98125699c5fe13fe7acbd7668be1e12b6bcedcd6
2022-03-23 02:11:19 +00:00
SongFerng Wang
75869b5fef
Merge "[LE adudio] The condition of right location is wrong."
2022-03-23 01:52:05 +00:00