diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-08-30 17:01:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-30 17:01:20 +0000 |
| commit | 92f5c1ad9fa216c45a3bcd066aca201e38772bec (patch) | |
| tree | 4fdc7478c36309791eb1aa7e7db6509b5793b3d6 | |
| parent | 90995fcb6778a9cb6dc35be12aeb1a5d0dcbb5ae (diff) | |
| parent | f38789078b5270335fc96e20f9ab5b3bdcfec921 (diff) | |
Merge "Fix secondary call card alignment in RTL" into klp-dev
| -rw-r--r-- | InCallUI/res/layout/secondary_call_info.xml | 24 |
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 369763abf..97bc0bf98 100644 --- a/InCallUI/res/layout/secondary_call_info.xml +++ b/InCallUI/res/layout/secondary_call_info.xml @@ -36,20 +36,27 @@ android:layout_height="match_parent" android:background="@drawable/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" @@ -57,6 +64,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" |