Commit Graph

102235 Commits

Author SHA1 Message Date
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
Diego Vela
668aea9b55 Use androidx.window from prebuilt.
Use androidx.window prebuilt for consistency.

Bug: 223114509
Test: m -j

Change-Id: Ifeba7d0073ba7aeb6308c186738161c4857a97a3
2022-04-14 09:55:36 +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
ef18bbeb65 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 am: cc1c6ea62e am: a3e7bb87d0 am: e8c950cd67 am: 006d600030
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: I5cae7c8c80408d2b29cae1f6fd87a95df3b81cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 06:16:47 +00:00
Edgar Wang
006d600030 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 am: cc1c6ea62e am: a3e7bb87d0 am: e8c950cd67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: I2db8911bde40827bdead74a3ec7dd34189027bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 05:23:59 +00:00
Edgar Wang
e8c950cd67 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 am: cc1c6ea62e am: a3e7bb87d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

Change-Id: Ie2618bd433be0d30c08c3d7785a641cae41cc4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 05:02:34 +00:00
Edgar Wang
a805feeac7 Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 am: cc1c6ea62e am: ef843e844a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

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

Change-Id: I1999c2815380ff902d79e46131f43ece95efad2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 04:40:33 +00:00
Edgar Wang
ef843e844a Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d am: 9562e2e011 am: 7541d3495f am: 9a206c5870 am: cc1c6ea62e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674

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

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

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

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

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

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

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

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

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

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

Change-Id: Id670e5e1da00f436a60f6e8c911c583d67659ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 03:01:34 +00:00