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

Commit 35b182ba authored by tobitege's avatar tobitege Committed by Gerrit Code Review
Browse files

QSTileView: fix label recreate order 

A dual label could never get the labelDescription because the
normal label was always null'ed first.
Therefore first process the dual label, then the normal label.

Change-Id: Id8a7bce58c26c60bcadf89c4aba41a8974a1c649
parent 4de351e7

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

+5 −5
Original line number Diff line number Diff line
@@ -124,11 +124,6 @@ public class QSTileView extends ViewGroup { 
    private void recreateLabel() {

        CharSequence labelText = null;

        CharSequence labelDescription = null;

        if (mLabel != null) {

            labelText = mLabel.getText();

            removeView(mLabel);

            mLabel = null;

        }

        if (mDualLabel != null) {

            labelText = mDualLabel.getText();

            if (mLabel != null) {
@@ -137,6 +132,11 @@ public class QSTileView extends ViewGroup { 
            removeView(mDualLabel);

            mDualLabel = null;

        }

        if (mLabel != null) {

            labelText = mLabel.getText();

            removeView(mLabel);

            mLabel = null;

        }

        final Resources res = mContext.getResources();

        if (mDual) {

            mDualLabel = new QSDualTileLabel(mContext);