Commit Graph

39356 Commits

Author SHA1 Message Date
SongFerngWang
f74ef50676 [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749 am: e0e40b1e88
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063562

Change-Id: I3ed592f99798051fc56100e7bbadbf1c0fcc9260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 09:59:28 +00:00
SongFerngWang
bb912216d7 [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1 am: f54b0ca79f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063561

Change-Id: I85831aa726c5a9a7b48d54318a8563fcf37d19ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 09:59:27 +00:00
SongFerngWang
4d039eaefc [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721 am: f795e9b6d0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063560

Change-Id: Ib78e2038d2cb8bc2e9e7bdb78c90bd515f8b306d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 09:59:26 +00:00
SongFerngWang
094ba6c077 Lost code for setting the list as visible am: 130b739ed1 am: 2b02a6f3d2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063559

Change-Id: I6f19543b5ff79a9dc2d1c7779aea1da8372b573f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 09:59:25 +00:00
SongFerngWang
22f38eeacd The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd am: a6794dcc8a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558

Change-Id: Ib1b6efb59ba378841a76eab036a5975e86647082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 09:59:24 +00:00
SongFerngWang
d4ca5a289f The carrier name is wrong in the dialog am: f513452d4b am: c70bde0995
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557

Change-Id: Ic6d51241edee333838e7b9d0472dd8267db68794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 09:59:22 +00:00
SongFerngWang
de8a16419e Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063556

Change-Id: I00831568c5e8f24676fe640ec7f1756d30a41efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 09:59:21 +00:00
SongFerng Wang
028ad8fd3d Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555

Change-Id: Ie213f2dbb5ed5c12210d7fe32b32217314f9b9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 09:56:24 +00:00
SongFerngWang
e0e40b1e88 [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog am: 650b048749
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063562

Change-Id: I9f5686677f2ee6562e8d5ee64a6aa7db6e78ee83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:13 +00:00
SongFerngWang
f54b0ca79f [MEP] Refactor SlotSidecar API for all of sim page. am: 3597302ae1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063561

Change-Id: I9542a089b58595a0e2e528070acbe8c7221ebe34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:11 +00:00
SongFerngWang
f795e9b6d0 [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063560

Change-Id: If1d1172fd657eb43510b1672323244317163d1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:10 +00:00
SongFerngWang
2b02a6f3d2 Lost code for setting the list as visible am: 130b739ed1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063559

Change-Id: I7e5baa3413178156c144c84e8ebd9db75f9b59de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:09 +00:00
SongFerngWang
a6794dcc8a The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558

Change-Id: I117ed9f34fdf3758525dec30b1364db0a7645bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:08 +00:00
SongFerngWang
c70bde0995 The carrier name is wrong in the dialog am: f513452d4b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557

Change-Id: I3582f4af795152245bcb57b08550e3e994cb0853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:06 +00:00
SongFerngWang
d4b95990e9 Refine the mobile data selection UI am: 964c7d5eaf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063556

Change-Id: I6e1add83c0f35569443da12f0f991be7a69f90eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:05 +00:00
SongFerng Wang
1e89cd323e Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555

Change-Id: I517c537db0a1b619f3891f27d798b3741e7c8fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:02:17 +00:00
SongFerng Wang
3f830cc646 Merge "Hide the Contact sharing toggle for LE audio mode" 2022-04-14 07:07:24 +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
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
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
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
Xiao Ma
ce9b4447c4 Remove the legacy config_ethernet_iface_regex from Settings.
Bug: 214348333
Test: m Settings
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
      tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherEnablerTest
Change-Id: I822ff60ee8be63ff0c518d2972ad8b30dfacadcd
2022-04-13 18:37:26 +09:00
Edgar Wang
019eb77224 Fix LaunchAnyWhere in AppRestrictionsFragment
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3)
2022-04-13 04:51:09 +00:00
Bill Yi
c854c108a2 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:25 +00:00
Treehugger Robot
a1e66c3aca Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I67259014672c0cac5375b25d6c05a73b5ffc30da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 10:41:07 +00:00
Treehugger Robot
02701dd8b1 Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I686382ad702fb8e9fc090ea8441f9a1b3cae0716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 10:03:46 +00:00
Treehugger Robot
d6d6c5c020 Merge "Settings: Fix sometimes reset progress dialog not dismissed" 2022-04-08 09:46:39 +00:00
Bill Yi
35525a5617 Merge SP2A.220405.004 to aosp-master - DO NOT MERGE
Merged-In: I2a97159d0de32a6262bbace7bb82b09897447bdb
Merged-In: I58aad30729443e148da154a0d1125a6e8cb8c9d3
Change-Id: I593218f8417ab99d88c16705eef2cef705e0fcf7
2022-04-07 18:41:02 -07:00
TreeHugger Robot
df06dcecbe Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev 2022-04-07 18:08:21 +00:00
Arc Wang
1c8edd20a3 [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628095

Bug: 181962311
Change-Id: I7f99b94832948db188ddd45fd5e2a87ebc28af6f
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:35:48 +00:00
Arc Wang
b95bd5b449 Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 11:33:54 +08:00
Xin Li
e75d9ee3e9 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I50e3649c21bb83ee9130fa98a71560fe261198a9
Change-Id: I2a97159d0de32a6262bbace7bb82b09897447bdb
2022-04-01 20:32:46 +00:00
Weng Su
c422d95147 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I7ba4a451a493b9d4df278f7aee6bfbacc9bf2322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:47:33 +00:00
Weng Su
c68e241fa6 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" 2022-04-01 08:08:51 +00:00
Treehugger Robot
3fb5213538 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: Ida0dd5521a0bf94599315658b70c14a058295585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 07:36:46 +00:00
Treehugger Robot
0159ca5d9c Merge "Settings: Fix cellular internet option Not seen after internet reset" 2022-04-01 06:52:44 +00:00
Treehugger Robot
caa0bbd931 Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9 am: 3531a34760
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409

Change-Id: Iffb14760e676a66d061f500a1e9fc383c2a317e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 02:01:14 +00:00
Treehugger Robot
f558fc27d9 Merge "Settings: Fix WifiSettings FC when rotating screen" 2022-04-01 01:23:47 +00:00
Quang Luong
6ca8dd1b1a Do update signal icon for -1 level in AddAppNetworksFragment am: baf2ef0be6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17511482

Change-Id: I50e3649c21bb83ee9130fa98a71560fe261198a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 17:45:25 +00:00
hoffc
0991b39ed3 Settings: Fix NPE FC when access saved wifi p2p device after screen rotation
Rotating screen, wifi p2p setting fragement will be re-created and the selected wifi p2p device will be saved in onSaveInstanceState. However, now this saved wifi p2p device is restored in onActivityCreated, this is too late. So when getting this saved wifi p2p device return NULL in onCreateDialog and leads to NPE force close.

Restore the saved wifi p2p device in onCreateView instead of onActivityCreated.

Bug: 220025725
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest

Change-Id: I9b746e21f7f3651c69b1445f2389c089ec19319c
2022-03-31 06:52:37 +00:00
hoffc
5710b02972 Settings: Fix cellular internet option Not seen after internet reset
Cellular internet preference will be hidden during reset internet, and resume to be visible after successfully reset or reset timeout. Due to the wrong immediately param value assigned for hidePreference method, which results in cellular internet preference not seen after internet reset.

Assign correct immediately param value when resuming after internet reset.

Bug: 224893326
Test: manual test
atest InternetResetHelperTest

Change-Id: I3f8d5dd9de2a56ecfe201483ee8a95b379e8fe65
2022-03-31 04:01:58 +00:00
hoffc
f3fe5cf197 Settings: Fix WifiSettings FC when rotating screen
Rotating screen will trigger wifisettings re-creation. Force close occurs If receiving wifi picker tracker callback during activity finishing.

Bug: 218411211
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest

Change-Id: I06d251a8a12d3f8785db24ead0abe31c0f34cc9b
2022-03-31 04:00:52 +00:00
Quang Luong
baf2ef0be6 Do update signal icon for -1 level in AddAppNetworksFragment
The level of a WifiEntry may be -1 (WIFI_LEVEL_UNREACHABLE) due to race
conditions. Thus, only update the signal icon if the level is a valid
value [0, 4]

Bug: 201488249
Test: m
Change-Id: I87f1c108d262bb5a7575c9ad434d2cfb953134af
(cherry picked from commit 9d66b22ee0)
2022-03-30 21:48:31 +00:00