Commit Graph

102235 Commits

Author SHA1 Message Date
Edgar Wang
7541d3495f Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: I20b4dbcd149a796e0c56657403d30d6f31d3274c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 03:01:15 +00:00
Edgar Wang
f306a7d1df Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 am: 036905c62a am: 2263cbafcb am: 5eaa6f4a33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: If69ec7450d2823eda740d2540c624899121c91ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:54:08 +00:00
Edgar Wang
0aa8d138f6 Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 am: 0b17e62b6b am: 38ad8f1cdd am: 67e77a940a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: I64240354203356a2e0df248e22a2bb787abc0620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:54:01 +00:00
Edgar Wang
aea669a442 Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6 am: 280cf1e018 am: 1489d352b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677

Change-Id: I70a0cdbe769a1f54ce125324c2f5204be5d7b292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:53:53 +00:00
Edgar Wang
ee78e77aae Fix LaunchAnyWhere in AppRestrictionsFragment am: f600c05a5a am: 52c173bb2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730678

Change-Id: I95f8e4d6928b084544671966889e9bf47883e31e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:53:46 +00:00
Edgar Wang
5eaa6f4a33 Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 am: 036905c62a am: 2263cbafcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: I984d6ee4085f710c4d89a579c1ee9862f8afb429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:49:18 +00:00
Edgar Wang
67e77a940a Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 am: 0b17e62b6b am: 38ad8f1cdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: I63fedbc5c4051476051f63c40de2a334321b8991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:49:11 +00:00
Edgar Wang
2263cbafcb Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 am: 036905c62a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: I968e9a703cd02f07fe017b4c891e961ceb2634ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:49:06 +00:00
Edgar Wang
1489d352b6 Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6 am: 280cf1e018
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677

Change-Id: I1df26bd5e0cbb03b6a2dbe1ce17d98fe90e8e91b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:49:05 +00:00
Edgar Wang
38ad8f1cdd Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 am: 0b17e62b6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: Ifb5fea395bee6d0951689f377ea70a7405ef872f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:49:00 +00:00
Edgar Wang
52c173bb2e Fix LaunchAnyWhere in AppRestrictionsFragment am: f600c05a5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730678

Change-Id: I8ed8792698b508aaaf1b019aa7640a04b0ef2ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:48:58 +00:00
Edgar Wang
280cf1e018 Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677

Change-Id: I7f47d79589f9d8c66284fd9a496c0ed64de2f45b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:48:55 +00:00
Edgar Wang
c660a824ad Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6 am: 036905c62a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: I2d0ff9805d228064c1ba1823a68e64bf42cd9ca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:48:10 +00:00
Edgar Wang
f3d3f1e2f6 Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31 am: 0b17e62b6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: If819d19a7b3967ef57c68f0fb29824daf6b92fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:48:03 +00:00
Edgar Wang
036905c62a Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28 am: 03d36d79d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: Iba3eba75524c0e6b64a7c69e38733e844b08e086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:47:56 +00:00
Edgar Wang
8ff68f9850 Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677

Change-Id: I3248f9b64e348700f3ef5f23c8655e3b88ea40a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:47:56 +00:00
Edgar Wang
0b17e62b6b Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676

Change-Id: Ia021a8974fa666e1aa2b5f87418bd1096473f2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:47:49 +00:00
Edgar Wang
9562e2e011 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: Ib3c3ca64de6e099b2e2fde18abd35feb3412878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:47:48 +00:00
Edgar Wang
03d36d79d6 Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675

Change-Id: Ice72452717b8ca2edd68a01ba103b33cc7b12fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:47:40 +00:00
Edgar Wang
52180e031d Fix LaunchAnyWhere in AppRestrictionsFragment am: 019eb77224
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730679

Change-Id: I489e5b8ff03e563cd71cb413c8b24a2cc049c096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 02:47:20 +00:00
Xiao Ma
f59510a5ee Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3 am: a8ff1f723c am: d60998396a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: I2e9854b47e7081eb2f0340f695d746fb80caf8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 01:57:11 +00:00
Stanley Wang
58a5338c78 Merge "Add the title of the SettingsMainSwitchPreference in the mobile_network_settings.xml to avoid the preference can not be indexed." into tm-dev 2022-04-14 01:52:44 +00:00
Xiao Ma
d60998396a Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3 am: a8ff1f723c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: Ie6ace4dda17b456042295b9104d2ca0246a1ad7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 01:34:45 +00:00
Xiao Ma
a8ff1f723c Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: I9aaf20d105029e379dc8c6c28b3c88d4a75e7424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 01:11:22 +00:00
Xiao Ma
73d83b69d3 Merge "Remove the legacy config_ethernet_iface_regex from Settings." 2022-04-14 00:50:31 +00:00
SongFerngWang
ef80331fb0 [MEP] sort the simSlotMapping by logcal slot id
The modem assign the simSlotMapping like UiccSlotMapping[
(mPortIndex=0, mPhysicalSlotIndex=0, mLogicalSlotIndex=1),
UiccSlotMapping (mPortIndex=1, mPhysicalSlotIndex=0,
mLogicalSlotIndex=0)]. The settings replace the first one
UiccSlotMapping when user insert psim and the both of esim
profile are not enabled. It is not correct. The root cause is that
the settings did not sort the simSlotMapping by logcal slot id.

Bug: 223662007
Test: atest UiccSlotUtilTest  (PASS)
Change-Id: I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85
Merged-In: I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85
2022-04-14 03:47:20 +08:00
SongFerngWang
ccd55cc5c9 In E+E, the user can't enable the PSIM
In the E+E and there is the empty slot, the user can't enable PSIM.
Since the settings can't set the correct simSlotMapping.

Bug: 222231991
Test: atest UiccSlotUtilTest (All passes) and Build pass
Change-Id: Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec
Merged-In: Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec
2022-04-14 03:46:28 +08:00
SongFerngWang
2479c9f7bd [MEP] psim's logical slot index is 0
psim's logical slot index is 0, so changing the API and adding test
cases.

Bug: 221839363
Test: atest UiccSlotUtilTest
Change-Id: I1588bd4a2f552a6b41844883b6ad50f1bfec95de
(cherry picked from commit b162438b5d)
Merged-In: I1588bd4a2f552a6b41844883b6ad50f1bfec95de
2022-04-14 03:45:55 +08:00
SongFerngWang
5c0df6913b [MEP] The condition of "null point check" is wrong
The condition of "null point check" is wrong at the
SimSlotChangeHandler.

Bug: 222035986
Test: Build pass. maunal test.
Change-Id: I1b81faf082163643c1d17eae2f66d75b450288fe
(cherry picked from commit f64b2c09c0)
Merged-In: I1b81faf082163643c1d17eae2f66d75b450288fe
2022-04-14 03:41:38 +08:00
SongFerngWang
d786b64ff6 Fix the settings crash when SimDialogActivity is null
The PreferredSimDialogFragment did updateDialog after SimDialogActivity
was finished. It caused the settings crash. This is similar to b/184899699

Bug: 220803944
Test: build pass
Change-Id: I9a5964400a63053e362632944b9e7aa8ec1bbea8
(cherry picked from commit 70bf76a436)
Merged-In: I9a5964400a63053e362632944b9e7aa8ec1bbea8
2022-04-14 03:38:21 +08:00
SongFerngWang
7ab547f1b8 [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId
1. The subscriptionInfo's getSimSlotIndex is logical slotId. The code
   should compare it with uiccSlotMapping.getLogicalSlotIndex()
2. Rename the parameters for the readability.
3. The mobile network selection dialog did not be closed after user clicked.

Bug: 219951253
Test: manual test.
Change-Id: I7fef78547f4e6283791cd15a03275eaefeb50e3c
Merged-In: I7fef78547f4e6283791cd15a03275eaefeb50e3c
2022-04-14 03:37:16 +08:00
Weng Su
fe4fcb4019 Add 2 pixels to top of Advanced Options component
- Hide the edges of text appearing as a quick fix suggested by the UX
  team.

- See the result screenshot in b/218307103#comment18

Bug: 218307103
Test: manual test by pixel device
Change-Id: I11bfdf57ff4d57786e40f49ad747a35efe2bb207
2022-04-14 03:37:06 +08:00
SongFerngWang
9ee91da8e1 [MEP] the port id is wrong
The function uses wrong information to get the portId.

Bug: 218907001
Test: manual test.
Change-Id: I70a02299c40ada4c2a700fc035034e8db24b6f03
Merged-In: I70a02299c40ada4c2a700fc035034e8db24b6f03
2022-04-14 03:35:40 +08:00
SongFerngWang
650b048749 [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog
Inserting a pSIM while user has 2 esims already active,
the UI shows MEP dialog

Bug: 218451733
Test: manual test. To fake the MEP condition, and then checking the UI
Change-Id: I48fa3d483873315d7e05b39369085c48af779522
Merged-In: I48fa3d483873315d7e05b39369085c48af779522
2022-04-14 03:35:01 +08:00
SongFerngWang
3597302ae1 [MEP] Refactor SlotSidecar API for all of sim page.
remove the SlotSidecar's run() and using new run() with port id
information.

Bug: 218439715
Test: manual test for UI
Change-Id: I81479a0c514f2b8f58b9167b31d357f017732482
Merged-In: I81479a0c514f2b8f58b9167b31d357f017732482
2022-04-14 03:34:17 +08:00
SongFerngWang
d3f3730721 [MEP]The Esim's PhysicalSlotIndex is wrong
Using the getUiccSlotInfo API to get the PhysicalSlotIndex of esim

Bug: 215302360
Test: atest UiccSlotUtilTest
Change-Id: Ic43d6c4a3209d24673769b71b9a148e780ee81ab
Merged-In: Ic43d6c4a3209d24673769b71b9a148e780ee81ab
2022-04-14 03:33:42 +08:00
SongFerngWang
130b739ed1 Lost code for setting the list as visible
the ag/16710087 lost the code.

Bug: 216233391
Test: manual test: check the UI
make RunSettingsRoboTests ROBOTEST_FILTER=SimListDialogFragmentTest (PASS)

Change-Id: If6ad5422a820627873e58b144e7b65a8b0130def
Merged-In: If6ad5422a820627873e58b144e7b65a8b0130def
2022-04-14 03:33:08 +08:00
SongFerngWang
f88ffb09fd The list does not follow the UX dialog design doc in alert dialog.
Please refer the comment#1 at bug and there are change below
- the divider is 4dp
- the item's radius is different in the list.

Bug: 216233391
Test: manual test: check the UI
make RunSettingsRoboTests ROBOTEST_FILTER=SimListDialogFragmentTest (PASS)

Change-Id: I758d60202fcf477aeb49014e60b949e7ad08c082
Merged-In: I758d60202fcf477aeb49014e60b949e7ad08c082
2022-04-14 03:32:16 +08:00
SongFerngWang
f513452d4b The carrier name is wrong in the dialog
The condition is wrong, should use the subId.

Bug: 212195309
Test: build pass. manual test the dialog.
Change-Id: I894c78fccab511f26bf779638cac1f18a07a86c4
Merged-In: I894c78fccab511f26bf779638cac1f18a07a86c4
2022-04-14 03:31:34 +08:00
SongFerngWang
964c7d5eaf Refine the mobile data selection UI
-Adding the margin for bottom at dialog
-Modify the text color of summay in the list at dialog when device is
dark mode.

Bug: 212396431
Test: build pass and check the dialog UI.
Change-Id: I1ec587fd9d64ad67bbf3479c7931c0a901f572cf
Merged-In: I1ec587fd9d64ad67bbf3479c7931c0a901f572cf
2022-04-14 03:30:50 +08:00
Bill Yi
ca510b1550 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia0e4059c70a11bee3ddfd90a61c26010c6475a1b
2022-04-13 16:23:21 +00:00
Bill Yi
23f2bfb3a3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idb05bdc603a7427c0cf9c163f90930e13f1ed875
2022-04-13 16:11:33 +00:00
Bill Yi
e658709ef2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I30f99979ea41038330eda97e7dc5d53549a48c52
2022-04-13 16:04:23 +00:00
Bill Yi
b31a221ace Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I75dddbe8e74962a916bb0a7e5cb56716d9874988
2022-04-13 16:00:08 +00:00
Bill Yi
76f5b29384 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5ec0223f3a55adbe9153f2029dde633a80343b1c
2022-04-13 15:50:38 +00:00
Bill Yi
5a7f4fcb00 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
Blank merge reason: commit message contains skip directive

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

Change-Id: I0ae2629d034e7f95e43879a0698a21ed5a338df8
2022-04-13 15:45:55 +00:00
Bill Yi
17b4bfa5b0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I593a171f3dc0d3b1bd530985f9e3c02b2e923287
2022-04-13 15:45:45 +00:00
SongFerngWang
11b337178a Hide the Contact sharing toggle for LE audio mode
1. Add the device config key
2. Hide the Contact sharing toggle for LE audio mode
Bug: 228415214
Test: manual test and take the screenshots at bug.

Change-Id: I07674d0edbcd642814ed61ccd13cb4e1e42caec3
2022-04-13 22:11:49 +08:00
TreeHugger Robot
ee6d283b82 Merge "[Panlingual] Make error message generic." into tm-dev 2022-04-13 13:26:20 +00:00
Stanley Wang
75a349c1b8 Add the title of the SettingsMainSwitchPreference in the
mobile_network_settings.xml to avoid the preference can not
be indexed.

Fix: 222021677
Test: manually test and review the UI
Change-Id: I53b1637e845489bc1df2e7b4216c56400fd28659
2022-04-13 19:36:36 +08:00