Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2095b50 authored by Richard MacGregor's avatar Richard MacGregor
Browse files

[2/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: Iefa3a22ae2871560dd1347a9e59e70fda7a9c19b
parent 6eceee2f

res/layout/dialtacts_activity.xml

+19 −34
Original line number Original line Diff line number Diff line
@@ -64,53 +64,38 @@ 
        android:layout_gravity="center_horizontal|bottom"

        android:layout_gravity="center_horizontal|bottom"

        android:visibility="gone">

        android:visibility="gone">





        <LinearLayout

        <com.android.phone.common.widget.ResizingILDContainerLayout

            android:id="@+id/ild_container"

            android:id="@+id/ild_container"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:orientation="horizontal"

            android:layout_gravity="center_horizontal"

            android:layout_gravity="center_horizontal"

            android:weightSum="6"

            android:layout_marginTop="@dimen/ild_margin_height"

            android:layout_marginTop="@dimen/ild_margin_height"

            android:layout_marginBottom="@dimen/ild_margin_height" >

            android:layout_marginBottom="@dimen/ild_margin_height" >





            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:layout_weight="3"

                android:layout_marginStart="@dimen/dialpad_credits_padding"

                android:orientation="horizontal" >



            <TextView

            <TextView

                android:id="@+id/ild_country"

                android:id="@+id/ild_country"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="@dimen/dialpad_credits_padding"

                android:textColor="@color/credit_banner_text"

                android:textColor="@color/credit_banner_text"

                    android:layout_gravity="start" />

                android:textAlignment="viewStart"



            </LinearLayout>



            <LinearLayout

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:singleLine="true"

                android:layout_weight="3"

                android:ellipsize="end" />

                android:layout_marginEnd="@dimen/dialpad_credits_padding"

                android:orientation="vertical" >





            <TextView

            <TextView

                android:id="@+id/ild_rate"

                android:id="@+id/ild_rate"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                    android:layout_marginStart="4dp"

                android:layout_marginStart="@dimen/dialpad_credits_spacing"

                android:layout_marginEnd="@dimen/dialpad_credits_padding"

                android:textStyle="bold"

                android:textStyle="bold"

                android:textColor="@color/credit_banner_text"

                android:textColor="@color/credit_banner_text"

                    android:layout_gravity="end" />

                android:textAlignment="viewEnd"



                android:singleLine="true"

            </LinearLayout>

                android:ellipsize="end" />





        </LinearLayout>

        </com.android.phone.common.widget.ResizingILDContainerLayout>





        <View

        <View

            android:layout_width="match_parent"

            android:layout_width="match_parent"

res/values/cm_dimens.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
<resources>

<resources>

    <dimen name="contact_list_badge_margin">1dp</dimen>

    <dimen name="contact_list_badge_margin">1dp</dimen>

    <dimen name="dialpad_credits_padding">14dp</dimen>

    <dimen name="dialpad_credits_padding">14dp</dimen>

    <dimen name="dialpad_credits_spacing">4dp</dimen>





    <dimen name="call_log_spam_info_text_size">10sp</dimen>

    <dimen name="call_log_spam_info_text_size">10sp</dimen>