summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-01-30 18:48:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-30 18:48:15 +0000
commitd2f15ecb08042aa49da04cb2bdbc6f4e7f97c757 (patch)
tree4cd1b1c68dd0bce54bb8dca5029a7d4795a0ecc6 /packages/SystemUI
parentf38824928cf586124ffc6dc7a85c7f8603f77c5a (diff)
parentb2dd5cb900d031acf255bddcbe2f57efb8f43adb (diff)
downloadframeworks_base-d2f15ecb08042aa49da04cb2bdbc6f4e7f97c757.zip
frameworks_base-d2f15ecb08042aa49da04cb2bdbc6f4e7f97c757.tar.gz
frameworks_base-d2f15ecb08042aa49da04cb2bdbc6f4e7f97c757.tar.bz2
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
automerge: b2dd5cb * commit 'b2dd5cb900d031acf255bddcbe2f57efb8f43adb': Fix QS bluetooth tile accessibility issue
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/QSPanel.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/QSTileView.java3
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) {