From b54d25ee13cdb0d00acc934d8e88f9acbedfcb17 Mon Sep 17 00:00:00 2001 From: Jiashen Wang Date: Mon, 18 Jan 2021 19:14:00 -0800 Subject: [PATCH] Slot Change Receiver Migration Implemented slot change cases when pSIM is inserted and removed. Bug: 153811431 Bug: 170508680 Test: Manually tested Change-Id: Ib0a96da1d7d702f7c64e75b929c73b8548f8e459 --- AndroidManifest.xml | 20 ++ res/drawable/ic_network_signal_blue.xml | 37 ++ res/layout/choose_sim_activity.xml | 48 +++ res/values-night/themes_suw.xml | 1 + res/values/dimens.xml | 3 + res/values/strings.xml | 28 ++ res/values/themes_suw.xml | 9 + res/xml/items_multiple_carrier.xml | 16 + .../settings/network/SubscriptionUtil.java | 63 ++++ .../ToggleSubscriptionDialogActivity.java | 9 +- .../settings/sim/ChooseSimActivity.java | 321 ++++++++++++++++++ .../settings/sim/DsdsDialogActivity.java | 147 ++++++++ .../settings/sim/SimActivationNotifier.java | 78 ++++- .../settings/sim/SimNotificationService.java | 4 + .../SwitchToEsimConfirmDialogActivity.java | 119 +++++++ .../sim/receivers/SimSlotChangeHandler.java | 51 ++- .../sim/receivers/SimSlotChangeReceiver.java | 4 +- 17 files changed, 936 insertions(+), 22 deletions(-) create mode 100644 res/drawable/ic_network_signal_blue.xml create mode 100644 res/layout/choose_sim_activity.xml create mode 100644 res/xml/items_multiple_carrier.xml create mode 100644 src/com/android/settings/sim/ChooseSimActivity.java create mode 100644 src/com/android/settings/sim/DsdsDialogActivity.java create mode 100644 src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8b3160f213d..8aabdb793f8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3669,6 +3669,26 @@ + + + + + + diff --git a/res/drawable/ic_network_signal_blue.xml b/res/drawable/ic_network_signal_blue.xml new file mode 100644 index 00000000000..3d7f63c4d33 --- /dev/null +++ b/res/drawable/ic_network_signal_blue.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/res/layout/choose_sim_activity.xml b/res/layout/choose_sim_activity.xml new file mode 100644 index 00000000000..05ab2300e30 --- /dev/null +++ b/res/layout/choose_sim_activity.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/res/values-night/themes_suw.xml b/res/values-night/themes_suw.xml index 16aba76f69a..dea7b1a5f78 100644 --- a/res/values-night/themes_suw.xml +++ b/res/values-night/themes_suw.xml @@ -21,6 +21,7 @@ + + + +