diff options
| author | Sai Cheemalapati <saicheems@google.com> | 2014-06-24 17:50:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-24 17:32:43 +0000 |
| commit | 7db0506d0a6ec71fef6a580408b871c9d51e7b84 (patch) | |
| tree | d517f7f4e5543c80fe1fcccd0fcb4ace92cf20b0 | |
| parent | bd93cb5444e886266b47e504138bcc65e6f09cbe (diff) | |
| parent | d21e30f9c7bf9c841d9789c1f23cf205c677dcf5 (diff) | |
Merge "Add text resizing to InCallUI name field (1/2)."
| -rw-r--r-- | InCallUI/res/layout/primary_call_info.xml | 6 | ||||
| -rw-r--r-- | InCallUI/res/values/dimens.xml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml index 36c9813e2..4cd04f353 100644 --- a/InCallUI/res/layout/primary_call_info.xml +++ b/InCallUI/res/layout/primary_call_info.xml @@ -63,14 +63,16 @@ </LinearLayout> <!-- Name (or the phone number, if we don't have a name to display). --> - <TextView android:id="@+id/name" + <com.android.phone.common.widget.ResizingTextTextView android:id="@+id/name" + xmlns:ex="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="-5dp" android:fontFamily="sans-serif-light" android:textAppearance="?android:attr/textAppearanceLarge" android:textSize="@dimen/call_name_text_size" - android:singleLine="true" /> + android:singleLine="true" + ex:resizing_text_min_size="@dimen/call_name_text_min_size" /> <LinearLayout diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index a60b39227..ac82a1dbd 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -39,7 +39,8 @@ <!-- Text size for the name in the call info. --> <dimen name="call_status_text_size">22sp</dimen> - <dimen name="call_name_text_size">36sp</dimen> + <dimen name="call_name_text_size">45sp</dimen> + <dimen name="call_name_text_min_size">34sp</dimen> <dimen name="call_label_text_size">18sp</dimen> <!-- Right padding for name and number fields in the call banner. This padding is used to ensure that ultra-long names or |