PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,576 Commits 1 Branch 0 Tags
0bdce691c3d8fe83c93ef53d74ab64db07de8828
Commit Graph

102576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
18bc6404e4 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c0a1868fbd 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17407842

Change-Id: Ie630a5e513ec0fceb1fee54fb8e07c06f9da25c9
 2022-03-26 00:50:54 +00:00
Bill Yi
c0a1868fbd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f7899a8f405fd16339a9615074c21a278760530
 2022-03-26 00:49:25 +00:00
Bill Yi
8ec48abdce [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab 2p: af27e56740 
Blank merge reason: parent was merged -s ours

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178

Change-Id: I3863496292251ffa9f893b5177ba9105f4821c34
 2022-03-26 00:16:52 +00:00
Bill Yi
af27e56740 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178

Change-Id: I927b18f9b79cdd5f39f98cfcfc6bfb10898b5d27
 2022-03-26 00:16:40 +00:00
Bill Yi
9d49da2eab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42fdaf7064635675a25608949766ef25348f6f6e
 2022-03-26 00:13:52 +00:00
Joe Bolinger
9295240071 Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f am: 6f94d1f784 am: 6b68635d89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: Idf4382d3e711c3641d735dd1396167cbb55953bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 23:10:02 +00:00
Joe Bolinger
50cd9ae3fa Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f am: 6f94d1f784 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: I54a17d4f14bb00de6a31c75b33932f5c13fe27f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 22:53:34 +00:00
Joe Bolinger
6b68635d89 Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f am: 6f94d1f784 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: I2bd4b51140edd593b3c2503f070aa3ced3905a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 22:53:27 +00:00
Joe Bolinger
6f94d1f784 Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185

Change-Id: I753ad8af595172167eb8b34dd73a58e95d65d1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 22:39:18 +00:00
Presubmit Automerger Backend
1243987d70 [automerge] Hide fingerprint setup animation from talkback users 2p: 404ed2b0b2 2p: d8ae83d3d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126

Change-Id: I27165dc669c3b717ca2c27615aa5bfb9a0a9da2d
 2022-03-25 22:26:34 +00:00
Presubmit Automerger Backend
d8ae83d3d3 [automerge] Hide fingerprint setup animation from talkback users 2p: 404ed2b0b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126

Change-Id: Icfed9f2e451e9ca3a5afee844959194a3242dffa
 2022-03-25 22:26:28 +00: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
Joe Bolinger
998dad16f3 Merge "Set exported flag to false." 2022-03-25 22:20:13 +00:00
Grace Cheng
404ed2b0b2 Hide fingerprint setup animation from talkback users 
Hides fingerprint setup animation from talkback users to prevent
unlabelled talkback

Fixes: 215461655
Test: Manually navigate to fingerprint setup page, swipe to confirm
animation is not focusable or spoken by talkback
Change-Id: I610ae68ed75d6b9f92005b0e12473b9c5dc6815b
 2022-03-25 21:52:40 +00:00
SongFerng Wang
716d9f1790 [automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb -s ours am: 8030d66e0d -s ours am: b88a4a8830 -s ours am: a32f1f6efa -s ours am: 2ad2d6fed0 -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: I01859cefc7a744e890780fc8eed095c52810e08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:22:16 +00:00
Peter Wang
a8ca968d5f [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -s ours am: 5695d6492e -s ours am: 8306a09319 -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: I50a4fe0562f1f24f5e51f6be6678485f6ff395f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:22:15 +00:00
SongFerng Wang
67476195b2 [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -s ours am: 86ab18c4d8 -s ours am: acf62bb5e7 -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: I11c601b3a4571c2da0179514b5d902a2cc050a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:21:03 +00:00
SongFerng Wang
ddadcc6440 [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -s ours am: e3064b5be5 -s ours am: 79174688ee -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: I0ad3840a742020eadea6fcb27766d37c052135f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:21:02 +00:00
SongFerng Wang
76c1ced016 [automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb -s ours am: 8030d66e0d -s ours am: b88a4a8830 -s ours am: a32f1f6efa -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: I262da1897971e3c200c0cc4110c4d9d1f5190db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:04:24 +00:00
Peter Wang
5c90648ab8 [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -s ours am: 5695d6492e -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: Ie7280e803ea93a1c66ff529f218e5a83bcf587bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:04:23 +00:00
SongFerng Wang
2ad2d6fed0 [automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb -s ours am: 8030d66e0d -s ours am: b88a4a8830 -s ours am: a32f1f6efa -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: If69de25230519190a6f1f1c6eb0eabe48d6d5319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:41 +00:00
Peter Wang
8306a09319 [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -s ours am: 5695d6492e -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: Ibc7a04b46e28c4a95934099e429dfda1ec89ba1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:40 +00:00
SongFerng Wang
2df3b51dfd [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -s ours am: 86ab18c4d8 -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: Ie9c9057f5928852c7c1ea674524e47decdbb4503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:16 +00:00
SongFerng Wang
86bc97769f [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -s ours am: e3064b5be5 -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: I6b0d3eb8c0d5e6d872568f7b35eaa55095b39058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:03:15 +00:00
SongFerng Wang
acf62bb5e7 [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -s ours am: 86ab18c4d8 -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: Ic7b3375b11c484ac0b3f23255b99d2316d13388b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:02:46 +00:00
SongFerng Wang
79174688ee [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -s ours am: e3064b5be5 -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: I81bd6a65601f27582bb0388aa77ea40ede390338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:02:43 +00:00
SongFerng Wang
a32f1f6efa [automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb -s ours am: 8030d66e0d -s ours am: b88a4a8830 -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: I264f63c88d5cec442774ddfe7f87a28c3d281259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:49:24 +00:00
Peter Wang
5695d6492e [automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c -s ours am: 810677e214 -s ours am: 16f75f0c64 -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: Ia51eb28953b2423993caf2fa4c0753ef2bb5bd51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:49:23 +00:00
SongFerng Wang
86ab18c4d8 [automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours am: 5dea8d562f -s ours am: 83a12cf22c -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: Idc449211d34212210751196365efb25b23b514fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:49:04 +00:00
SongFerng Wang
e3064b5be5 [automerger skipped] Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" am: 0f77d567b4 -s ours am: 9c1f66d741 -s ours am: 04bd163a85 -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: I8967ee5828aa186d70de94c4864b11027d823077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:49:02 +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
Joshua Mccloskey
9988cd0824 Merge "Only play fp vibration if accessibility is enabled." into tm-dev am: 566b8e5ab2 am: 5d9aeb5b18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17315311

Change-Id: I86b3aac32c3ab10f7c07252e0f6cf83717d0754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:25:54 +00:00
Joshua Mccloskey
5d9aeb5b18 Merge "Only play fp vibration if accessibility is enabled." into tm-dev am: 566b8e5ab2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17315311

Change-Id: I9a3384c42daaa822b27756d4f4fe226a51e1ce15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:17:04 +00:00
Joshua Mccloskey
6d0a1b8e5c Merge "Only play fp vibration if accessibility is enabled." into tm-dev am: 566b8e5ab2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17315311

Change-Id: I7dacad381cabaea1280e0710c5c56696237309ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:07:30 +00:00
Quang Luong
01e66ca398 Merge "Increase WifiEntryPreference summary max lines for verbose logging" into tm-dev am: 8a5e6be37a am: e031563cf8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17390718

Change-Id: Idb43e2757aa80549a33e52001ae23de033988ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:06:27 +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