Commit Graph

203 Commits

Author SHA1 Message Date
Chaohui Wang
91fd88a519 Fix first item not a11y focusable in SimListDialog
The root cause is there is a logic to get LayoutParams from parent, but
set to child, which cause some chaos.

This dialog can be started with
`adb shell am start -n com.android.settings/.sim.SimDialogActivity --ei
dialog_type 0`

Bug: 227418839
Test: manual test when Talkback enabled
Change-Id: Ia1014dea49cb5cf372afe5bb50972277309c7f63
2022-05-01 09:28:20 +08:00
SongFerng Wang
cdb08ee92a Merge "[MEP] The condition of "null point check" is wrong" into tm-dev 2022-03-03 12:36:59 +00:00
SongFerng Wang
9ca62b2290 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev 2022-03-03 12:36:43 +00:00
SongFerngWang
e90d80cc52 [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
(cherry picked from commit 181f8179f1)
2022-03-03 09:31:47 +00:00
SongFerngWang
ce8232d0a4 [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)
2022-03-03 09:18:53 +00:00
SongFerngWang
a3b98f5d04 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)
2022-03-03 09:18:39 +00:00
SongFerngWang
c747455196 [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
2022-02-09 16:06:18 +08:00
SongFerngWang
4d0749febd [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
2022-02-08 17:40:12 +08:00
SongFerngWang
04eec0382c 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
2022-01-27 10:18:00 +00:00
SongFerngWang
f2a8008ae3 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
2022-01-26 12:49:59 +08:00
SongFerngWang
43ebe68063 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
2021-12-29 14:31:13 +08:00
SongFerngWang
b5766e4422 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
2021-12-28 16:39:11 +08:00
SongFerng Wang
fdfb0bcf44 Merge changes I5c6ad4b3,Icb00b3fc
* changes:
  [MEP] renew the default data selection UI
  [MEP] renew the sim confirm dialog UI
2021-12-21 15:53:21 +00:00
SongFerngWang
be8f279f2c [MEP] renew the default data selection UI
- renew the default Data/Call/SMS selection

Bug: 199902896
Test: build pass and local UI test
Change-Id: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
2021-12-21 16:34:30 +08:00
Zoey Chen
6978a90e88 [Settings] Remove MobileNetworkActivity
- remove the component name when launching the intent, using the action intent to replace.

- remove MobileNetworkActivity and rename SubscriptionSettingsActivity as MobileNetworkActivity.

Bug: 210593601
Test: atest
Change-Id: Icb7adaf9f7c7dfe01ff5c133aee8387c1663546c
2021-12-16 13:30:25 +08:00
Zoey Chen
2c1fe3ca47 [Settings] Remove the legacy 2-pane registration
Test: atest
Bug: 209606859
Change-Id: Ia1788cdfd9a9e4c6bfeb25be1257f82900867114
2021-12-14 12:32:34 +08:00
SongFerngWang
22ab05b420 switch SIM refactor to support MEP
To create new dialog for MEP. It is a simple UI for testing,
not the final version.

Bug: 199902896
Test: local build pass.
Change-Id: Ief4299e775c0758e4b886d5eff13bd482f8c8ab3
2021-12-10 09:30:30 +08:00
SongFerngWang
1e0e9021ac switch SIM refactor to support MEP
1. Using new telephony API and doing the code refactor
2. To support multi esim profiles case

Bug: 199902896
Test: local build pass.
Change-Id: I8580022793e5c3fc14159f14b406f864353477f8
2021-12-08 18:35:33 +08:00
Sandeep Jawalkar
8bd3afc334 Merge "eSIM deprecated API test Refactoring" 2021-11-16 16:46:04 +00:00
sandeepjs
40ffe69a3e eSIM deprecated API test Refactoring
Test: build
Bug: 159354974
Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
2021-11-15 05:44:54 +00:00
Zoey Chen
6cf16b0aa9 [Settings] 1. Add configChange for WFC Activity to cover the changes of rotation and screen size
2. register split rule for MobileNetworkActivity

Bug: 204508876
Test: manual
Change-Id: Iff3dae41293e79b274d2928cb51efea46fb45dd4
2021-11-12 15:22:43 +08:00
Calvin Pan
216315523b Merge "Disable smart forwarding based on subid" into sc-qpr1-dev 2021-09-17 01:33:05 +00:00
Calvin Pan
e32a2abc16 Disable smart forwarding based on subid
Smart forwrading did not specify the subid when disabling feature, which
caused always dsiabled on default subid.

Bug: 194112447
Test: Enable/disable smart forwarding
Change-Id: Id900500f065c32b326ca6dfc39482f913fb9b8ff
2021-09-15 17:57:09 +08:00
Bonian Chen
94253d725e [Settings] Avoid from floating overlay when displaying SIM selection UI
Avoid from floating overlay when displaying SIM selection UI, which
could avoid from security issue.

Bug: 195667589
Test: local
Change-Id: I8db76005f2c3ad6cc94d68703b2b1647d81371f5
(cherry picked from commit 1cc61672ef)
2021-08-30 06:53:50 +00:00
Calvin Pan
3bf80c66ff Remove unnecessary condition
The call forward timer is only valid for the CF_REASON_NO_REPLY reason,
and it will be 0 in other cases. Remove the condition to prevent disable
processing not working.

Bug: 194112447
Test: Build pass
Change-Id: I824a61383b595284ee5694fcd31e58e2379997fb
2021-08-12 14:05:37 +00:00
Peter Wang
3b03d484fb Use ICU style for choose_sim_text to handle special cases in RU
Bug: 185406678
Test: Build
Change-Id: I43bf77b0b09ae4c2bb8b3acf976d996854a80866
2021-06-15 18:27:34 -07:00
Peter Wang
d79015628a Use BC theme for ChooseSimActivity
Uploading for beccamilman@

Bug: 190430469
Test: Local
Change-Id: If762380040f64266b34b1d62658010b80e8c0405
2021-06-10 19:27:46 -07:00
Jeremy Goldman
09a185dbca Store whether the Dialog was previously dismissed
The dialog can be dismissed by either the framework automatically (i.e.
when the screen is rotated) or when the subscriptions change.

If both of these things happen while the class is not deleted, then
dismiss() will be called twice and there will be a crash

Bug: 184899699
Test: atest -c SettingsUnitTests
Change-Id: Ibaef59696feb566664a424f65f806396f02497e8
2021-05-13 14:42:26 +08:00
Peter Wang
6e61073864 Change DSDS dialog confirm text from "Continue" to "Yes"
Bug: 131169645
Bug: 184769109
Test: N/A
Change-Id: Ide709c83459ec955739daa0f23167aa72a5665a9
2021-04-14 13:43:26 -07:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)"
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
2021-03-30 00:51:15 +00:00
Bonian Chen
d5ccde31a8 [Settings] Support getSystemService(Class<T>)
Add getSystemService(Class<T>) to align the capability with framework
part.

This is a back port from aosp/1639943, aosp/1645152 and aosp/1648047

Bug: 179640862
Test: local
Change-Id: I035db55a71f94000ca35f8d71f03c19208423c73
2021-03-24 00:59:46 +08:00
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:09:29 +00:00
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
Treehugger Robot
4357b14563 Merge "Add OWNERS" am: f69f3ed7dc am: 5e85b6b2a9 am: 181abccf09
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51c83010ba124a058173dbeec07465b243a366e4
2021-02-25 16:36:25 +00:00
SongFerngWang
f91d9c40f2 Add OWNERS
Bug: 179666288
Test: Build pass
Change-Id: I6e42f45083ee6dac9f0aeed4be71820107f4fd58
2021-02-19 02:33:26 +00:00
Jiashen Wang
15e7a0bce4 Fix the notification issue after pSIM is auto enabled
Bug: 179933905
Test: Manually tested
Change-Id: I52a751c515785618c9a1a5f3bc571687731b4552
2021-02-17 20:42:52 +00:00
Jiashen Wang
ce08013af6 Merge "Post SUW Slot Change Receiver Migration" into sc-dev 2021-02-05 18:13:58 +00:00
Jiashen Wang
85109678b2 Post SUW Slot Change Receiver Migration
Implement the case when user inserts / removes pSIM during the SUW.
Bug: 153811431
Bug: 170508680
Test: Manually tested

Change-Id: Iccc3a2fd416ccfb57c3b4f9dc7b32c0b7681c90b
2021-02-02 17:57:40 -08:00
Jiashen Wang
1ef16831b6 Fix ANR issue for SimSlotChangeReceiver
Bug: 179109464
Test: Manually tested
Change-Id: Ibcb5eb57cdb5a238f9e49945fea3da20b2ffb2ab
2021-02-02 11:23:13 -08:00
Jiashen Wang
b54d25ee13 Slot Change Receiver Migration
Implemented slot change cases when pSIM is inserted and removed.
Bug: 153811431
Bug: 170508680
Test: Manually tested

Change-Id: Ib0a96da1d7d702f7c64e75b929c73b8548f8e459
2021-01-28 14:15:53 -08:00
Jiashen Wang
a975202b8f Merge "Add a config flag to control slot change receiver in Settings" 2021-01-26 00:17:27 +00:00
Jeremy Goldman
09f43be1c6 Merge "SubscriptionsPreferenceController shows the unique sim description." 2021-01-25 09:03:40 +00:00
calvinpan
71dd99c767 [Smart forwarding] Enable/Disable Smart Forwarding flow
Bug: 170178144
Test: By manual
1. Test turn on/turn off flow
2. Test enter phone number flow

Change-Id: Icee8c85e71f72f467b2dc11b9b55c674f22d8179
2021-01-25 10:08:33 +08:00
calvinpan
6c21dd470d [Smart forwarding] Add UI for Smart Forwarding
Bug: 170178144
Test: By manual
1. Test turn on/turn off flow
2. Test enter phone number flow

Change-Id: I98be6f307f78b61020a15f72a3d4bf04089ead66
2021-01-25 10:08:02 +08:00
Jeremy Goldman
9d87cd9126 SubscriptionsPreferenceController shows the unique sim description.
Bug: 148303118
Bug: 150370656
Test: atest -c SubscriptionsPreferenceControllerTest
Change-Id: I041536fe0148087a068c6000383b382b0ff4e17c
2021-01-22 07:02:52 +00:00
Jiashen Wang
e9be9eb08b Add a config flag to control slot change receiver in Settings
Bug: 153811431
Bug: 170508680
Test: Manually tested
Change-Id: I4a06eba0d9e10c1eb9638a570af49df33758dba6
2021-01-21 14:53:27 -08:00
Jeremy Goldman
fb41503ca8 SimSelectNotification pending intent include an Immutable flag
Bug: 172212792
Test: atest SettingsUnitTests
Change-Id: Id40e145eed1d268e8147ad21d9b9147268a20453
2021-01-12 16:46:58 +08:00
Ashwini Oruganti
2f349da025 Bulk apply PendingIntent.FLAG_MUTABLE_UNAUDITED.
We've been working hard to require PendingIntents explicitly declare
if they allow their contents to be mutated or not, and to finish
landing that work this change applies the new FLAG_MUTABLE_UNAUDITED
flag to all remaining code locations until they can be manually
inspected.

Bug: 160794467
Test: manual
Change-Id: I7b9ef5dcd35187facef1ec424589b81f834f23c0
2021-01-08 13:14:05 -08:00
Malcolm Chen
1305cee98e Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 16:45:27 -08:00
Malcolm Chen
3ad8509b15 Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-14 11:55:07 -08:00