Quang Luong
93ae7acbf4
Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev
2022-04-14 16:14:21 +00:00
YK Hung
3a08246bd9
Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev
2022-04-14 14:12:33 +00:00
ykhung
39972db17d
Pass the activtiy launch flags into the AdvancedPowerUsageDetail
...
Bug: 227978302
Test: manual
Change-Id: I036bc90eb91fd59137b51817665378f218bbad1a
2022-04-14 19:57:14 +08:00
SongFerng Wang
b1166a441c
Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555
Change-Id: Ibcd93e3f6610c1f1dfbfa687ba8bec390b8456b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 10:11:52 +00:00
SongFerng Wang
9d10f0a9fb
Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409
Change-Id: If1486cddb0887de41eef67dcdb04fe385261cbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:37 +00:00
SongFerngWang
10d36c9800
In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408
Change-Id: I754af5b8ba51d3cfb73fc894796163209cf8d723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:36 +00:00
SongFerngWang
bca382eefb
[MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407
Change-Id: I88fe8f02e2cfc1d65a2626290b747cc454958819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:35 +00:00
SongFerngWang
ffdf3513ec
[MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566
Change-Id: I0f664206c950dae9204f36f1a28f1c63112b9bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:34 +00:00
SongFerngWang
d65110a8ff
Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565
Change-Id: Id6de8ec6e269fc6720c57ee04bd2e26d90293ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:32 +00:00
SongFerngWang
56f8390f6e
[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8 am: bfe417ee13
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564
Change-Id: I5ec77b0842dd250095adbb1cc063ec9d9e656a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:31 +00:00
SongFerngWang
b8a9355134
[MEP] the port id is wrong am: 9ee91da8e1 am: f80bc78252
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563
Change-Id: I64b9af4dca993a57954ef9163f5fa1dd5bd6da89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 09:59:30 +00:00
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
Tom Hsu
b18b106300
Merge "[Panlingual] Add a description for per app language." into tm-dev
2022-04-14 08:56:24 +00:00
SongFerng Wang
459429c182
Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409
Change-Id: I0737e21c4a5939de394c418cb9261a52a3f5df86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 08:24:21 +00:00
SongFerngWang
6282d8a5de
In E+E, the user can't enable the PSIM am: ccd55cc5c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408
Change-Id: If0aeb9e68364fc649d0b3877ba4f8bdc0dd9afec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 08:24:20 +00:00
SongFerngWang
83311b6208
[MEP] psim's logical slot index is 0 am: 2479c9f7bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407
Change-Id: Id29b82927a35b45ca339abbf3896d7a2e788b426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 08:24:19 +00:00
SongFerngWang
6a0742b2fb
[MEP] The condition of "null point check" is wrong am: 5c0df6913b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063566
Change-Id: I4066d3971802aa77ccdf3e11a67dbbf4a66cc9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 08:24:17 +00:00
SongFerngWang
a800c05ac7
Fix the settings crash when SimDialogActivity is null am: d786b64ff6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063565
Change-Id: I393f4a56a15b1288a0fa5f0bfd1b9e43101f555f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 08:24:16 +00:00
SongFerngWang
bfe417ee13
[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId am: 7ab547f1b8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063564
Change-Id: I7747af7bcd3406accc607e066a39fb38cada96f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 08:24:15 +00:00
SongFerngWang
f80bc78252
[MEP] the port id is wrong am: 9ee91da8e1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063563
Change-Id: I439d109e094d572c9bf645e75b46e4eb510d474b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 08:24:14 +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
3e9e489c0c
Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ...
...
* changes:
[MEP] sort the simSlotMapping by logcal slot id
In E+E, the user can't enable the PSIM
[MEP] psim's logical slot index is 0
[MEP] The condition of "null point check" is wrong
Fix the settings crash when SimDialogActivity is null
[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId
[MEP] the port id is wrong
[MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog
[MEP] Refactor SlotSidecar API for all of sim page.
[MEP]The Esim's PhysicalSlotIndex is wrong
Lost code for setting the list as visible
The list does not follow the UX dialog design doc in alert dialog.
The carrier name is wrong in the dialog
Refine the mobile data selection UI
2022-04-14 07:08:41 +00:00
SongFerng Wang
3f830cc646
Merge "Hide the Contact sharing toggle for LE audio mode"
2022-04-14 07:07:24 +00:00
tom hsu
5281736004
[Panlingual] Add a description for per app language.
...
- This is to notify some app may not support to user.
Bug: 228415129
Test: local
Change-Id: I6205e0b5fdb3ee42a22ae4995c99e9d8dc5e0a2d
2022-04-14 06:47:13 +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
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
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