am 1edf3821: Merge "Support RTL in InCall call card." into lmp-mr1-dev

* commit '1edf38212b4c29eeb46a81a9b58c8b80628e6d50':
  Support RTL in InCall call card.

2 files changed, 9 insertions, 3 deletions

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index 1f3b9549b..71369d479 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -64,6 +64,7 @@
         <TextView android:id="@+id/callStateLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textAlignment="viewStart"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textColor="@color/incall_accent_color"
             android:textSize="@dimen/call_status_text_size"
@@ -71,6 +72,7 @@
             android:singleLine="true"
             android:gravity="start"
             android:ellipsize="end" />
+
     </LinearLayout>
 
     <!-- Name (or the phone number, if we don't have a name to display). -->
@@ -80,6 +82,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="-5dp"
         android:fontFamily="sans-serif-light"
+        android:textAlignment="viewStart"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/call_name_text_size"
         android:singleLine="true"
@@ -95,9 +98,8 @@
 
         <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
         <LinearLayout android:id="@+id/labelAndNumber"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:orientation="horizontal">
 
                 <TextView android:id="@+id/label"
@@ -122,9 +124,11 @@
 
         <!-- Elapsed time indication for a call in progress. -->
         <TextView android:id="@+id/elapsedTime"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:layout_centerVertical="true"
+            android:textAlignment="viewEnd"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/incall_call_banner_subtext_color"
             android:textSize="@dimen/call_label_text_size"
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 6ecf62e99..9d11b4cfc 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -425,8 +425,10 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
         if (TextUtils.isEmpty(number) && TextUtils.isEmpty(label)) {
             mCallNumberAndLabel.setVisibility(View.GONE);
+            mElapsedTime.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
         } else {
             mCallNumberAndLabel.setVisibility(View.VISIBLE);
+            mElapsedTime.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
         }
 
         setPrimaryPhoneNumber(number);