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

Commit ba87ba5e authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 

automerge: 6d72d46b

* commit '6d72d46b':
  Ellipsize QS detail items when needed
parents 00a1fa3e 6d72d46b

packages/SystemUI/res/layout/qs_detail_item.xml

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
            android:id="@android:id/title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" />



        <TextView

packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ public class QSDetailItems extends FrameLayout { 
        title.setText(item.line1);

        final TextView summary = (TextView) view.findViewById(android.R.id.summary);

        final boolean twoLines = !TextUtils.isEmpty(item.line2);

        title.setMaxLines(twoLines ? 1 : 2);

        summary.setVisibility(twoLines ? VISIBLE : GONE);

        summary.setText(twoLines ? item.line2 : null);

        view.setMinimumHeight(mContext.getResources() .getDimensionPixelSize(