commit eb2f7b6b0bb974e59c7d1c1bdd168703e31fd385
author Fabian Kozynski <kozynski@google.com> Thu Nov 29 18:58:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 29 18:58:19 2018 +0000
tree e73076d4ca6880f403c6b1d9621db44577bf2a76
parent 70f3f5b9825d52a9eb22b860b87a0d22a154a2a3
parent a0cbcf942cbe78efc47b850878fdc6156ef5dea4

Merge "Correct context for TB on disabled tiles"

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
index 0638998..3a96595d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
@@ -198,7 +198,8 @@
         mIcon.setIcon(state, allowAnimations);
         setContentDescription(state.contentDescription);
 
-        mAccessibilityClass = state.expandedAccessibilityClassName;
+        mAccessibilityClass =
+                state.state == Tile.STATE_UNAVAILABLE ? null : state.expandedAccessibilityClassName;
         if (state instanceof QSTile.BooleanState) {
             boolean newState = ((BooleanState) state).value;
             if (mTileState != newState) {