diff options
| author | Jason Monk <jmonk@google.com> | 2015-01-30 19:32:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-30 19:32:01 +0000 |
| commit | c4980829e5288e8e92d783878f2058eed5eb148b (patch) | |
| tree | 5646c20f8291ae79cee226b44b8412d9c69cfcd5 /packages/SystemUI/src/com/android/systemui/qs | |
| parent | 84183103f4a9222ddbe22c7289f9627c74892d53 (diff) | |
| parent | b5083a7d54f839db779a1fa60adc3ac5dbf70e79 (diff) | |
| download | frameworks_base-c4980829e5288e8e92d783878f2058eed5eb148b.zip frameworks_base-c4980829e5288e8e92d783878f2058eed5eb148b.tar.gz frameworks_base-c4980829e5288e8e92d783878f2058eed5eb148b.tar.bz2 | |
am b5083a7d: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb automerge: d2f15ec
* commit 'b5083a7d54f839db779a1fa60adc3ac5dbf70e79':
Fix QS bluetooth tile accessibility issue
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSTileView.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 974235e..4dacacf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -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; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java index bb353d5..16ae6b4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java @@ -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) { |