Merge "IMS: CallLogs: Dialer requirements for UI 1.8+" into atel.lnx.2.0-dev
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 2fa3b94..28e8ac7 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -178,7 +178,9 @@
android:textDirection="ltr"
android:visibility="gone" />
- <TextView android:id="@+id/phoneNumber"
+ <com.android.phone.common.widget.ResizingTextTextView
+ xmlns:ex="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/phoneNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -187,7 +189,9 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/incall_call_banner_subtext_color"
android:textSize="@dimen/call_label_text_size"
- android:singleLine="false"
+ android:singleLine="true"
+ android:ellipsize="end"
+ ex:resizing_text_min_size="@dimen/call_label_text_min_size"
android:visibility="gone" />
</LinearLayout>
diff --git a/InCallUI/res/values-sw360dp/dimens.xml b/InCallUI/res/values-sw360dp/dimens.xml
index 9fbcd60..0436a4c 100644
--- a/InCallUI/res/values-sw360dp/dimens.xml
+++ b/InCallUI/res/values-sw360dp/dimens.xml
@@ -24,6 +24,7 @@
<dimen name="call_name_text_size">45dp</dimen>
<dimen name="call_name_text_min_size">34sp</dimen>
<dimen name="call_label_text_size">18sp</dimen>
+ <dimen name="call_labe_text_min_size">8sp</dimen>
<!-- The InCallUI dialpad will sometimes want digits sizes that are different from dialer. -->
<dimen name="dialpad_key_number_margin_bottom">@dimen/dialpad_key_number_default_margin_bottom</dimen>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 15520e5..3a926b6 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -52,6 +52,7 @@
<dimen name="call_name_text_size">34dp</dimen>
<dimen name="call_name_text_min_size">28sp</dimen>
<dimen name="call_label_text_size">16sp</dimen>
+ <dimen name="call_label_text_min_size">6sp</dimen>
<!-- Right padding for name and number fields in the call banner.
This padding is used to ensure that ultra-long names or
numbers won't overlap the elapsed time indication. -->
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 4598d3c..81c19a4 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -342,6 +342,13 @@
InCallPresenter.getInstance().updatePrimaryCallState();
}
+ @Override
+ public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
+ super.onMultiWindowModeChanged(isInMultiWindowMode);
+ Log.i(this, "recreate()...");
+ recreate();
+ }
+
// onPause is guaranteed to be called when the InCallActivity goes
// in the background.
@Override
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ca28569..0b70647 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -339,6 +339,33 @@
<string name="recentMissed_empty">"您没有任何未接电话。"</string>
<!-- Text displayed when the list of voicemails is empty -->
<string name="recentVoicemails_empty">"您未收到任何语音邮件。"</string>
+ <!-- Title for incoming 4G video call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_incoming_video_lte"/>
+ <string name="type_incoming_video_lte">"4G 视频通话来电"</string>
+ <!-- Title for missed 4G video call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_missed_video_lte"/>
+ <string name="type_missed_video_lte">"未接 4G 视频通话"</string>
+ <!-- Title for incoming 4G video call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_outgoing_video_lte"/>
+ <string name="type_outgoing_video_lte">"外拨 4G 视频通话"</string>
+ <!-- Title for incoming wifi voice call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_incoming_vowifi"/>
+ <string name="type_incoming_vowifi">"WLAN 语音通话来电"</string>
+ <!-- Title for incoming wifi video call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_incoming_video_wifi"/>
+ <string name="type_incoming_video_wifi">"WLAN 视频通话来电"</string>
+ <!-- Title for outgoing wifi voice call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_outgoing_vowifi"/>
+ <string name="type_outgoing_vowifi">"外拨 WLAN 语音通话"</string>
+ <!-- Title for outgoing wifi video call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_outgoing_video_wifi"/>
+ <string name="type_outgoing_video_wifi">"外拨 WLAN 视频通话"</string>
+ <!-- Title for missed wifi voice call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_missed_vowifi"/>
+ <string name="type_missed_vowifi">"未接 WLAN 语音通话"</string>
+ <!-- Title for missed wifi video call in call details screen [CHAR LIMIT=60] -->
+ <add-resource type="string" name="type_missed_video_wifi"/>
+ <string name="type_missed_video_wifi">"未接 WLAN 视频通话"</string>
<string name="add_to_white_list">"加入白名单"</string>
<string name="add_to_black_list">"加入黑名单"</string>