commit 84dfbd315966a61e4c60b2adc858e6e8ba747ea6
author Jason Monk <jmonk@google.com> Fri Sep 19 17:38:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 19 17:38:34 2014 +0000
tree 215c3032d02ad7cb70d4d1e4a3ccf8446cfa47ca
parent 99fcfcdc66f184514e9368ba78328de65d2d46c4
parent 15b49e05f2c5b68a3cdf6d67530858d92ffab9d6

am 7049944b: am 8598377b: Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev

* commit '7049944b9e23f9196dc532e7681d70eb7209777a':
  QS: Fix accessibility announce for dual tiles

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

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
index 8d7edb9..3574877 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
@@ -298,10 +298,11 @@
         if (mDual) {
             mDualLabel.setText(state.label);
             mDualLabel.setContentDescription(state.dualLabelContentDescription);
+            mTopBackgroundView.setContentDescription(state.contentDescription);
         } else {
             mLabel.setText(state.label);
+            setContentDescription(state.contentDescription);
         }
-        setContentDescription(state.contentDescription);
     }
 
     public void onStateChanged(QSTile.State state) {