From d6e8ea435025aceadbf58ba78c4a2dd7fc745027 Mon Sep 17 00:00:00 2001 From: Sandeep Gutta Date: Mon, 11 Nov 2013 19:23:13 +0530 Subject: DSDA: Add InCallUI DSDA support. -Add tab view support for DSDA -Add support to display voice calls based on the current active subscription. -Add few utilities in CallList, which required for handling voice calls across multiple subscription. Change-Id: Ib683f7c3b41ed3bb04367be1e9c331908bc46004 --- AndroidManifest.xml | 10 + res/drawable-hdpi/ic_sim_icon_1.png | Bin 0 -> 1363 bytes res/drawable-hdpi/ic_sim_icon_2.png | Bin 0 -> 1659 bytes res/drawable-mdpi/ic_sim_icon_1.png | Bin 0 -> 1224 bytes res/drawable-mdpi/ic_sim_icon_2.png | Bin 0 -> 1411 bytes res/drawable-xhdpi/ic_sim_icon_1.png | Bin 0 -> 1473 bytes res/drawable-xhdpi/ic_sim_icon_2.png | Bin 0 -> 1903 bytes res/layout/incall_screen_msim.xml | 83 ++++++ res/layout/msim_tab_sub_info.xml | 57 ++++ res/values/array.xml | 6 + res/values/dimens.xml | 3 + res/values/strings.xml | 5 + res/values/styles.xml | 2 +- src/com/android/incallui/CallButtonPresenter.java | 13 +- src/com/android/incallui/CallCardFragment.java | 4 +- src/com/android/incallui/CallHandlerService.java | 2 +- src/com/android/incallui/CallList.java | 120 +++++++- src/com/android/incallui/InCallActivity.java | 33 ++- src/com/android/incallui/InCallPresenter.java | 24 +- .../android/incallui/msim/MSimAnswerFragment.java | 325 +++++++++++++++++++++ .../android/incallui/msim/MSimAnswerPresenter.java | 198 +++++++++++++ .../android/incallui/msim/MSimInCallActivity.java | 232 +++++++++++++++ 22 files changed, 1102 insertions(+), 15 deletions(-) create mode 100644 res/drawable-hdpi/ic_sim_icon_1.png create mode 100644 res/drawable-hdpi/ic_sim_icon_2.png create mode 100644 res/drawable-mdpi/ic_sim_icon_1.png create mode 100644 res/drawable-mdpi/ic_sim_icon_2.png create mode 100644 res/drawable-xhdpi/ic_sim_icon_1.png create mode 100644 res/drawable-xhdpi/ic_sim_icon_2.png create mode 100644 res/layout/incall_screen_msim.xml create mode 100644 res/layout/msim_tab_sub_info.xml create mode 100644 src/com/android/incallui/msim/MSimAnswerFragment.java create mode 100644 src/com/android/incallui/msim/MSimAnswerPresenter.java create mode 100644 src/com/android/incallui/msim/MSimInCallActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9a873012..ee3c9de0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -49,6 +49,16 @@ android:exported="false"> + + + diff --git a/res/drawable-hdpi/ic_sim_icon_1.png b/res/drawable-hdpi/ic_sim_icon_1.png new file mode 100644 index 00000000..b95ab921 Binary files /dev/null and b/res/drawable-hdpi/ic_sim_icon_1.png differ diff --git a/res/drawable-hdpi/ic_sim_icon_2.png b/res/drawable-hdpi/ic_sim_icon_2.png new file mode 100644 index 00000000..a1725b2d Binary files /dev/null and b/res/drawable-hdpi/ic_sim_icon_2.png differ diff --git a/res/drawable-mdpi/ic_sim_icon_1.png b/res/drawable-mdpi/ic_sim_icon_1.png new file mode 100644 index 00000000..aa07a460 Binary files /dev/null and b/res/drawable-mdpi/ic_sim_icon_1.png differ diff --git a/res/drawable-mdpi/ic_sim_icon_2.png b/res/drawable-mdpi/ic_sim_icon_2.png new file mode 100644 index 00000000..581e0ae4 Binary files /dev/null and b/res/drawable-mdpi/ic_sim_icon_2.png differ diff --git a/res/drawable-xhdpi/ic_sim_icon_1.png b/res/drawable-xhdpi/ic_sim_icon_1.png new file mode 100644 index 00000000..05a798d9 Binary files /dev/null and b/res/drawable-xhdpi/ic_sim_icon_1.png differ diff --git a/res/drawable-xhdpi/ic_sim_icon_2.png b/res/drawable-xhdpi/ic_sim_icon_2.png new file mode 100644 index 00000000..700b75cd Binary files /dev/null and b/res/drawable-xhdpi/ic_sim_icon_2.png differ diff --git a/res/layout/incall_screen_msim.xml b/res/layout/incall_screen_msim.xml new file mode 100644 index 00000000..52f79a9f --- /dev/null +++ b/res/layout/incall_screen_msim.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/msim_tab_sub_info.xml b/res/layout/msim_tab_sub_info.xml new file mode 100644 index 00000000..2e71a19f --- /dev/null +++ b/res/layout/msim_tab_sub_info.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + diff --git a/res/values/array.xml b/res/values/array.xml index ba7e4cb3..50d28236 100644 --- a/res/values/array.xml +++ b/res/values/array.xml @@ -143,4 +143,10 @@ @string/description_direction_down_right + + @drawable/ic_sim_icon_1 + @drawable/ic_sim_icon_2 + @null + + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d0b86a96..6a210d31 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -61,6 +61,9 @@ the prox sensor kick in.) --> 20dp + + 14dp + 12dp 10dp diff --git a/res/values/strings.xml b/res/values/strings.xml index e4c06860..83850a56 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1530,4 +1530,9 @@ Manage conference call + + + SUB 1 + + SUB 2 diff --git a/res/values/styles.xml b/res/values/styles.xml index 45706532..adcfc5e9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -126,7 +126,7 @@ window background instead of the default dark grey. (We don't just use Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the InCallActivity to have the correct holo style. --> -