From ff0327931a1fdf2617559f7b0a7958c922dbfa30 Mon Sep 17 00:00:00 2001 From: Richard MacGregor Date: Wed, 11 May 2016 14:31:59 -0700 Subject: [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 --- res/layout/dialpad_view_unthemed.xml | 52 +++++------- res/values/cm_dimens.xml | 1 + .../common/widget/ResizingILDContainerLayout.java | 92 ++++++++++++++++++++++ 3 files changed, 113 insertions(+), 32 deletions(-) create mode 100644 src/com/android/phone/common/widget/ResizingILDContainerLayout.java 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"> - + android:layout_marginBottom="@dimen/ild_margin_height" + android:layoutDirection="locale" > - - - - - + android:textColor="@color/credit_banner_text" + android:textAlignment="viewStart" + android:singleLine="true" + android:ellipsize="end" /> - - - - - + android:textStyle="bold" + android:textColor="@color/credit_banner_text" + android:textAlignment="viewEnd" + android:singleLine="true" + android:ellipsize="end" /> - + 24dp 14dp + 4dp 11dp diff --git a/src/com/android/phone/common/widget/ResizingILDContainerLayout.java b/src/com/android/phone/common/widget/ResizingILDContainerLayout.java new file mode 100644 index 0000000..ff7e6fb --- /dev/null +++ b/src/com/android/phone/common/widget/ResizingILDContainerLayout.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2016 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.phone.common.widget; + +import android.annotation.Nullable; +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.widget.LinearLayout; +import com.android.phone.common.R; + +/** + * Makes sure that the two children textviews share the width fairly. + * If both text views fit within half the width, share 50/50. + * If neither text view fits within half the width, share 50/50. + * If one textview fits within half the width, give it enough space to show full string and give + * remaining space to other string. + */ +public class ResizingILDContainerLayout extends LinearLayout { + private View mIldCountry; + private View mIldRate; + + public ResizingILDContainerLayout(Context context) { + super(context); + } + + public ResizingILDContainerLayout(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + public ResizingILDContainerLayout(Context context, @Nullable AttributeSet attrs, + int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public ResizingILDContainerLayout(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mIldCountry = findViewById(R.id.ild_country); + mIldRate = findViewById(R.id.ild_rate); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + mIldCountry.measure(0, 0); + mIldRate.measure(0, 0); + + final LinearLayout.LayoutParams countryLayoutParams = + (LinearLayout.LayoutParams) mIldCountry.getLayoutParams(); + final LinearLayout.LayoutParams rateLayoutParams = + (LinearLayout.LayoutParams) mIldRate.getLayoutParams(); + final int width = View.MeasureSpec.getSize(widthMeasureSpec) - + countryLayoutParams.leftMargin - countryLayoutParams.rightMargin - + rateLayoutParams.leftMargin - rateLayoutParams.rightMargin; + final int halfWidth = width / 2; + int countryWidth = mIldCountry.getMeasuredWidth(); + int rateWidth = mIldRate.getMeasuredWidth(); + + if (halfWidth <= countryWidth && halfWidth > rateWidth) { + countryWidth = width - rateWidth; + } else if (halfWidth > countryWidth && halfWidth <= rateWidth) { + rateWidth = width - countryWidth; + } else { + // space equally + countryWidth = rateWidth = halfWidth; + } + + + countryLayoutParams.width = countryWidth; + rateLayoutParams.width = rateWidth; + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } +} \ No newline at end of file -- cgit v1.2.3