summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-08-30 09:03:20 -0700
committerYorke Lee <yorkelee@google.com>2013-08-30 09:03:20 -0700
commitf38789078b5270335fc96e20f9ab5b3bdcfec921 (patch)
treea52dc86175a4c7e459ec65f8b9230e673514ffd0 /InCallUI
parent7569427c703ae89003317ee3e37dfa9e171d8abe (diff)
Fix secondary call card alignment in RTL
Bug: 10534849 Change-Id: I2c523525a35f121e76842e6d7db209b18deec946
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/layout/secondary_call_info.xml24
1 files changed, 16 insertions, 8 deletions
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index 546278f95..4354be475 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -33,20 +33,27 @@
<!-- TODO(klp): Add clickable dim effect -->
- <!-- Name (or the phone number, if we don't have a name to display). -->
- <TextView android:id="@+id/secondaryCallName"
- style="@style/SecondaryCallInfoSecondaryCallName"
+ <!-- Parent FrameLayout is used to size the background correctly, while the child TextView
+ just wraps its content and is aligned with layout_gravity start so that it is aligned
+ to the correct side in RTL mode regardless of whether the text is Arabic or not -->
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/call_banner_height"
- android:gravity="top|start"
android:paddingStart="@dimen/call_banner_side_padding"
android:paddingEnd="@dimen/call_banner_side_padding"
android:paddingTop="@dimen/call_banner_top_bottom_padding"
android:paddingBottom="@dimen/call_banner_top_bottom_padding"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/incall_call_banner_text_color"
- android:singleLine="true"
- android:background="@color/incall_call_banner_background" />
+ android:background="@color/incall_call_banner_background">
+ <!-- Name (or the phone number, if we don't have a name to display). -->
+ <TextView android:id="@+id/secondaryCallName"
+ style="@style/SecondaryCallInfoSecondaryCallName"
+ android:layout_gravity="top|start"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@color/incall_call_banner_text_color"
+ android:singleLine="true"/>
+ </FrameLayout>
<!-- Call status of the background call, usually the string "On hold". -->
<TextView android:id="@+id/secondaryCallStatus"
@@ -54,6 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/call_banner_height"
android:gravity="top|end"
+ android:layout_gravity="end"
android:paddingStart="@dimen/call_banner_side_padding"
android:paddingEnd="@dimen/call_banner_side_padding"
android:paddingTop="@dimen/call_banner_top_bottom_padding"