summaryrefslogtreecommitdiffstats
path: root/java/com/android/incallui/incall/impl
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2017-10-10 12:15:08 -0700
committerEric Erfanian <erfanian@google.com>2017-10-11 07:06:24 -0700
commit00623aa60a7908b0709df38632cfa576cb15e33e (patch)
tree35bbae5a10d673a11eec6f20954305bc2eb9aa4f /java/com/android/incallui/incall/impl
parent7b96fb1690255f13591edba01770d2d82c197194 (diff)
downloadandroid_packages_apps_Dialer-00623aa60a7908b0709df38632cfa576cb15e33e.tar.gz
android_packages_apps_Dialer-00623aa60a7908b0709df38632cfa576cb15e33e.tar.bz2
android_packages_apps_Dialer-00623aa60a7908b0709df38632cfa576cb15e33e.zip
Implement SIM swapping
When the call is still ringing, a new button is added to allow to user to call with the other SIM. A background worker will be created to hang up the phone and redial with the other SIM. The in call UI will be prevented from ending during the process. Video: https://drive.google.com/a/google.com/file/d/0B2eYBUUznfyTSl9MdXQ0V1ZzQkE/view?usp=sharing UX has not been finalized, the icon and position are just placeholder. Bug: 64215256 Test: SwapSimWorkerTest PiperOrigin-RevId: 171715715 Change-Id: Idb3f486e9fc9a45d4c5e244af2d7d91b075bf0f2
Diffstat (limited to 'java/com/android/incallui/incall/impl')
-rw-r--r--java/com/android/incallui/incall/impl/ButtonChooserFactory.java1
-rw-r--r--java/com/android/incallui/incall/impl/ButtonController.java17
-rw-r--r--java/com/android/incallui/incall/impl/InCallFragment.java4
-rw-r--r--java/com/android/incallui/incall/impl/res/values/strings.xml4
4 files changed, 25 insertions, 1 deletions
diff --git a/java/com/android/incallui/incall/impl/ButtonChooserFactory.java b/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
index 0f4a95d38..0d0a93256 100644
--- a/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
+++ b/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
@@ -112,6 +112,7 @@ class ButtonChooserFactory {
mapping.put(InCallButtonIds.BUTTON_AUDIO, MappingInfo.builder(2).build());
mapping.put(InCallButtonIds.BUTTON_MERGE, MappingInfo.builder(3).setSlotOrder(0).build());
mapping.put(InCallButtonIds.BUTTON_ADD_CALL, MappingInfo.builder(3).build());
+ mapping.put(InCallButtonIds.BUTTON_SWAP_SIM, MappingInfo.builder(4).build());
return mapping;
}
}
diff --git a/java/com/android/incallui/incall/impl/ButtonController.java b/java/com/android/incallui/incall/impl/ButtonController.java
index b7a47f08e..cefbd723b 100644
--- a/java/com/android/incallui/incall/impl/ButtonController.java
+++ b/java/com/android/incallui/incall/impl/ButtonController.java
@@ -560,4 +560,21 @@ interface ButtonController {
inCallScreenDelegate.onSecondaryInfoClicked();
}
}
+
+ class SwapSimButtonController extends SimpleNonCheckableButtonController {
+
+ public SwapSimButtonController(InCallButtonUiDelegate delegate) {
+ super(
+ delegate,
+ InCallButtonIds.BUTTON_SWAP_SIM,
+ R.string.incall_content_description_swap_sim,
+ R.string.incall_label_swap_sim,
+ R.drawable.quantum_ic_swap_calls_white_36);
+ }
+
+ @Override
+ public void onClick(View view) {
+ delegate.swapSimClicked();
+ }
+ }
}
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java
index 13175656d..f0504bc56 100644
--- a/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -110,7 +110,8 @@ public class InCallFragment extends Fragment
|| id == InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO
|| id == InCallButtonIds.BUTTON_ADD_CALL
|| id == InCallButtonIds.BUTTON_MERGE
- || id == InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE;
+ || id == InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE
+ || id == InCallButtonIds.BUTTON_SWAP_SIM;
}
@Override
@@ -198,6 +199,7 @@ public class InCallFragment extends Fragment
buttonControllers.add(new ButtonController.AddCallButtonController(inCallButtonUiDelegate));
buttonControllers.add(new ButtonController.SwapButtonController(inCallButtonUiDelegate));
buttonControllers.add(new ButtonController.MergeButtonController(inCallButtonUiDelegate));
+ buttonControllers.add(new ButtonController.SwapSimButtonController(inCallButtonUiDelegate));
buttonControllers.add(
new ButtonController.UpgradeToVideoButtonController(inCallButtonUiDelegate));
buttonControllers.add(
diff --git a/java/com/android/incallui/incall/impl/res/values/strings.xml b/java/com/android/incallui/incall/impl/res/values/strings.xml
index 2b30dfa53..d0217566a 100644
--- a/java/com/android/incallui/incall/impl/res/values/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values/strings.xml
@@ -61,6 +61,10 @@
<string name="incall_label_swap">Swap</string>
+ <!-- Button shown during a call with a multi-SIM device to hang up and call with the other SIM
+ instead. [CHAR LIMIT=12] -->
+ <string name="incall_label_swap_sim">Change SIM</string>
+
<!-- Used to inform the user that the note associated with an outgoing call has been sent.
[CHAR LIMIT=32] -->
<string name="incall_note_sent">Note sent</string>