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

Commit e84e6676 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a bug where text could overlap in Quick settings

Bug: 17434395
Change-Id: I001f54586666e2e575b0295315f7b2181c25a1e9
parent 51ae05d9
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
import android.view.Gravity;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -41,7 +40,7 @@ import java.util.Objects;
 *               truncate.
 *   Second line: ellipsis if necessary
 */
public class QSDualTileLabel extends FrameLayout {
public class QSDualTileLabel extends LinearLayout {

    private final Context mContext;
    private final TextView mFirstLine;
@@ -54,6 +53,7 @@ public class QSDualTileLabel extends FrameLayout {
    public QSDualTileLabel(Context context) {
        super(context);
        mContext = context;
        setOrientation(LinearLayout.VERTICAL);

        mHorizontalPaddingPx = mContext.getResources()
                .getDimensionPixelSize(R.dimen.qs_dual_tile_padding_horizontal);
@@ -70,13 +70,13 @@ public class QSDualTileLabel extends FrameLayout {
        mFirstLineCaret.setScaleType(ImageView.ScaleType.MATRIX);
        mFirstLineCaret.setClickable(false);
        firstLineLayout.addView(mFirstLineCaret);
        addView(firstLineLayout, newFrameLayoutParams());
        addView(firstLineLayout, newLinearLayoutParams());

        mSecondLine = initTextView();
        mSecondLine.setPadding(mHorizontalPaddingPx, 0, mHorizontalPaddingPx, 0);
        mSecondLine.setEllipsize(TruncateAt.END);
        mSecondLine.setVisibility(GONE);
        addView(mSecondLine, newFrameLayoutParams());
        addView(mSecondLine, newLinearLayoutParams());

        addOnLayoutChangeListener(new OnLayoutChangeListener() {
            @Override
@@ -89,7 +89,7 @@ public class QSDualTileLabel extends FrameLayout {
        });
    }

    private static LayoutParams newFrameLayoutParams() {
    private static LayoutParams newLinearLayoutParams() {
        final LayoutParams lp =
                new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
        lp.gravity = Gravity.CENTER_HORIZONTAL;