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

Commit 8df98bb8 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am b2dd5cb9: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 

* commit 'b2dd5cb9':
  Fix QS bluetooth tile accessibility issue
parents 402e5bc6 b2dd5cb9

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

+3 −1
Original line number Diff line number Diff line
@@ -423,7 +423,9 @@ public class QSPanel extends ViewGroup { 
        }



        for (TileRecord record : mRecords) {

            record.tileView.setDual(record.tile.supportsDualTargets());

            if (record.tileView.setDual(record.tile.supportsDualTargets())) {

                record.tileView.handleStateChanged(record.tile.getState());

            }

            if (record.tileView.getVisibility() == GONE) continue;

            final int cw = record.row == 0 ? mLargeCellWidth : mCellWidth;

            final int ch = record.row == 0 ? mLargeCellHeight : mCellHeight;

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

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class QSTileView extends ViewGroup { 
        }

    }



    public void setDual(boolean dual) {

    public boolean setDual(boolean dual) {

        final boolean changed = dual != mDual;

        mDual = dual;

        if (changed) {
@@ -199,6 +199,7 @@ public class QSTileView extends ViewGroup { 
        setFocusable(!dual);

        mDivider.setVisibility(dual ? VISIBLE : GONE);

        postInvalidate();

        return changed;

    }



    private void setRipple(RippleDrawable tileBackground) {