Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Selim Cinek
2014-09-10 13:36:17 +00:00
committed by Android (Google) Code Review
parent 00fb8a80c8 e84e6676c4
commit ee5234f200
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/qs/QSDualTileLabel.java
View File

@@ -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;