Merge "IMS-VT: Handle InCallActivity destroy when low battery dialog is showing" into atel.lnx.2.0-dev
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 8aaabf9..cdc254c 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -533,6 +533,7 @@
<string name="open_now">Open now</string>
<!-- Displayed when a place is closed. -->
<string name="closed_now">Closed now</string>
+ <string name="call_failed_due_to_validate_number">Unable to make video call, incorrect number format</string>
<string name="call_state_dialing">Dialing</string>
<string name="call_state_holding">Holding</string>
<string name="call_state_active">Active</string>
diff --git a/InCallUI/src/com/android/incallui/InCallMessageController.java b/InCallUI/src/com/android/incallui/InCallMessageController.java
index de6ce44..e8611b4 100644
--- a/InCallUI/src/com/android/incallui/InCallMessageController.java
+++ b/InCallUI/src/com/android/incallui/InCallMessageController.java
@@ -310,6 +310,9 @@
case QtiCallConstants.CALL_FAIL_EXTRA_CODE_LOCAL_LOW_BATTERY:
QtiCallUtils.displayToast(mContext, R.string.call_failed_due_to_low_battery);
break;
+ case QtiCallConstants.CALL_FAIL_EXTRA_CODE_LOCAL_VALIDATE_NUMBER:
+ QtiCallUtils.displayToast(mContext, R.string.call_failed_due_to_validate_number);
+ break;
default:
break;
}
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index bd7c091..70d0561 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -62,6 +62,7 @@
android:layout_height="match_parent"
android:layout_gravity="bottom|right"
android:layout_weight="1"
+ android:visibility="gone"
android:background="@drawable/floating_action_button"
android:contentDescription="@string/action_menu_dialpad_button"
android:src="@drawable/ic_add_group_holo_dark"/>
diff --git a/res/values/config.xml b/res/values/config.xml
index 614cdf2..e992426 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -33,4 +33,7 @@
<bool name="config_regional_video_call_welcome_dialog">false</bool>
<bool name="config_regional_pup_no_available_network">false</bool>
<bool name="config_regional_call_data_usage_enable">false</bool>
+ <!--not display SIP dial icon -->
+ <bool name="config_hide_SIP_dial_icon">false</bool>
+
</resources>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 12304c0..d7bb71f 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -449,8 +449,10 @@
mFloatingActionButton = (ImageButton) findViewById(R.id.floating_action_button);
mDialCallButton = findViewById(R.id.floating_action_button);
mFloatingActionButton.setOnClickListener(this);
- mConferenceDialButton = (ImageButton) findViewById(R.id.dialConferenceButton);
- mConferenceDialButton.setOnClickListener(this);
+ if (!getResources().getBoolean(R.bool.config_hide_SIP_dial_icon)) {
+ mConferenceDialButton = (ImageButton) findViewById(R.id.dialConferenceButton);
+ mConferenceDialButton.setOnClickListener(this);
+ }
mFloatingActionButtonController = new FloatingActionButtonController(this,
floatingActionButtonContainer,mFloatingActionButton);