summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-01-10 01:50:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-10 01:50:38 +0000
commit6df1e263dcbbff92c584fe13a9d49bd75ae58cae (patch)
tree41e619599b51522b47b4985ec11677711c20a301
parent820ebb5a23877f46f60366da52e9a4c7c39e633c (diff)
parent21982cad6ff68ee8628fafb2acb055e79517ff46 (diff)
am 4ba60da1: am 8e1c0a98: Merge "Tidy up text alignments for secondary call info." into lmp-mr1-dev
* commit '4ba60da11d069360170575b615ae914e2065a78a': Tidy up text alignments for secondary call info.
-rw-r--r--InCallUI/res/layout/secondary_call_info.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index a1d12a4df..85eef0ee1 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -59,6 +59,7 @@
android:layout_height="wrap_content"
android:textColor="@color/incall_banner_secondary_text_color"
android:textSize="@dimen/secondary_call_info_text_size"
+ android:textAlignment="viewStart"
android:ellipsize="marquee"
android:singleLine="true"/>
@@ -74,6 +75,7 @@
android:layout_height="wrap_content"
android:textColor="@color/incall_banner_secondary_text_color"
android:textSize="@dimen/secondary_call_info_text_size"
+ android:textAlignment="viewStart"
android:singleLine="true"/>
</LinearLayout>
@@ -89,7 +91,6 @@
android:text="@string/onHold"
android:textColor="@color/incall_banner_secondary_text_color"
android:textSize="@dimen/secondary_call_info_text_size"
- android:textAlignment="textEnd"
android:singleLine="true" />
</LinearLayout>