Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev

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;

 *               truncate.

 *   Second line: ellipsis if necessary

 */

public class QSDualTileLabel extends FrameLayout {

public class QSDualTileLabel extends LinearLayout {

    private final Context mContext;

    private final TextView mFirstLine;

    public QSDualTileLabel(Context context) {

        super(context);

        mContext = context;

        setOrientation(LinearLayout.VERTICAL);

        mHorizontalPaddingPx = mContext.getResources()

                .getDimensionPixelSize(R.dimen.qs_dual_tile_padding_horizontal);

        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

        });

    }

    private static LayoutParams newFrameLayoutParams() {

    private static LayoutParams newLinearLayoutParams() {

        final LayoutParams lp =

                new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);

        lp.gravity = Gravity.CENTER_HORIZONTAL;