diff options
| author | Jason Monk <jmonk@google.com> | 2015-01-30 19:27:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-30 19:27:06 +0000 |
| commit | b5083a7d54f839db779a1fa60adc3ac5dbf70e79 (patch) | |
| tree | 4e6ed9d57537cfb3fdce4926480c0a7b4aef7f3c /packages | |
| parent | 734219d9c22cbab2549d1d43d077e9e8e089730c (diff) | |
| parent | d2f15ecb08042aa49da04cb2bdbc6f4e7f97c757 (diff) | |
| download | frameworks_base-b5083a7d54f839db779a1fa60adc3ac5dbf70e79.zip frameworks_base-b5083a7d54f839db779a1fa60adc3ac5dbf70e79.tar.gz frameworks_base-b5083a7d54f839db779a1fa60adc3ac5dbf70e79.tar.bz2 | |
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb
automerge: d2f15ec
* commit 'd2f15ecb08042aa49da04cb2bdbc6f4e7f97c757':
Fix QS bluetooth tile accessibility issue
Diffstat (limited to 'packages')
| -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) { |