diff options
author | Andrew Lee <anwlee@google.com> | 2014-12-12 22:10:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-12 22:10:23 +0000 |
commit | 1edf38212b4c29eeb46a81a9b58c8b80628e6d50 (patch) | |
tree | ed6a4038e2ebc4cbf6acd84b45636c11e1dad4a9 | |
parent | 6bd19a57611950ff85c0411b77ea5c051e7659a6 (diff) | |
parent | c296217682c185a33cbecf7a4c5376941d8b573f (diff) | |
download | packages_apps_InCallUI-1edf38212b4c29eeb46a81a9b58c8b80628e6d50.tar.gz packages_apps_InCallUI-1edf38212b4c29eeb46a81a9b58c8b80628e6d50.tar.bz2 packages_apps_InCallUI-1edf38212b4c29eeb46a81a9b58c8b80628e6d50.zip |
Merge "Support RTL in InCall call card." into lmp-mr1-dev
-rw-r--r-- | res/layout/primary_call_info.xml | 10 | ||||
-rw-r--r-- | src/com/android/incallui/CallCardFragment.java | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml index 1f3b9549..71369d47 100644 --- a/res/layout/primary_call_info.xml +++ b/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/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java index 6ecf62e9..9d11b4cf 100644 --- a/src/com/android/incallui/CallCardFragment.java +++ b/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); |