diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-05-11 14:31:59 -0700 |
|---|---|---|
| committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-05-12 15:47:32 -0700 |
| commit | ff0327931a1fdf2617559f7b0a7958c922dbfa30 (patch) | |
| tree | c8d6f5258de9b0b023436d8ce636875af0d8ba3c /res | |
| parent | bdd80a256ef3fc9bf40a50ff61a1f610ac3dd62b (diff) | |
| download | android_packages_apps_PhoneCommon-ff0327931a1fdf2617559f7b0a7958c922dbfa30.tar.gz android_packages_apps_PhoneCommon-ff0327931a1fdf2617559f7b0a7958c922dbfa30.tar.bz2 android_packages_apps_PhoneCommon-ff0327931a1fdf2617559f7b0a7958c922dbfa30.zip | |
[1/2] Credit text and action should be limited to single line
The credit text and action weren't limited to a single line, causing
increased credit bar size if text was translated into another language.
Ticket CD-631 & CD-637
Change-Id: I89c3725f5d7040299b90491a745eb96d93fb1db9
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/dialpad_view_unthemed.xml | 52 | ||||
| -rw-r--r-- | res/values/cm_dimens.xml | 1 |
2 files changed, 21 insertions, 32 deletions
diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml index 3ac2f55..7624d07 100644 --- a/res/layout/dialpad_view_unthemed.xml +++ b/res/layout/dialpad_view_unthemed.xml @@ -33,51 +33,39 @@ android:orientation="vertical" android:visibility="gone"> - <LinearLayout + <com.android.phone.common.widget.ResizingILDContainerLayout android:id="@+id/ild_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_gravity="center_horizontal" - android:weightSum="6" android:layout_marginTop="@dimen/ild_margin_height" - android:layout_marginBottom="@dimen/ild_margin_height"> + android:layout_marginBottom="@dimen/ild_margin_height" + android:layoutDirection="locale" > - <LinearLayout - android:layout_width="0dp" + <TextView + android:id="@+id/ild_country" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" - android:layout_weight="3" android:layout_marginStart="@dimen/dialpad_credits_padding" - android:orientation="horizontal" > - - <TextView android:id="@+id/ild_country" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/credit_banner_text" - android:layout_gravity="start" /> - - </LinearLayout> + android:textColor="@color/credit_banner_text" + android:textAlignment="viewStart" + android:singleLine="true" + android:ellipsize="end" /> - <LinearLayout - android:layout_width="0dp" + <TextView + android:id="@+id/ild_rate" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" - android:layout_weight="3" + android:layout_marginStart="@dimen/dialpad_credits_spacing" android:layout_marginEnd="@dimen/dialpad_credits_padding" - android:orientation="vertical" > - - <TextView android:id="@+id/ild_rate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="4dp" - android:textStyle="bold" - android:textColor="@color/credit_banner_text" - android:layout_gravity="end" /> - - </LinearLayout> + android:textStyle="bold" + android:textColor="@color/credit_banner_text" + android:textAlignment="viewEnd" + android:singleLine="true" + android:ellipsize="end" /> - </LinearLayout> + </com.android.phone.common.widget.ResizingILDContainerLayout> <View android:layout_width="match_parent" diff --git a/res/values/cm_dimens.xml b/res/values/cm_dimens.xml index 1749454..bc07983 100644 --- a/res/values/cm_dimens.xml +++ b/res/values/cm_dimens.xml @@ -32,6 +32,7 @@ <dimen name="call_method_spinner_arrow_width">24dp</dimen> <dimen name="dialpad_credits_padding">14dp</dimen> + <dimen name="dialpad_credits_spacing">4dp</dimen> <!-- Dimensions for VoLTE annunciator --> <dimen name="volte_padding_start">11dp</dimen> |