Merge "QS - Fix race condition in accessibility" am: 302efd6125 am: 3c0a8bba3c am: b12ed1e10f

am: 0a4e1b7078

Change-Id: I1409cc428b41b01ffb1461f011337a7cbe409b46
This commit is contained in:
Adrian Roos
2016-12-29 00:05:22 +00:00
committed by android-build-merger

View File

@@ -351,7 +351,10 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
@Override
public void onAnnouncementRequested(CharSequence announcement) {
announceForAccessibility(announcement);
if (announcement != null) {
mHandler.obtainMessage(H.ANNOUNCE_FOR_ACCESSIBILITY, announcement)
.sendToTarget();
}
}
};
r.tile.addCallback(callback);
@@ -526,10 +529,13 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
private class H extends Handler {
private static final int SHOW_DETAIL = 1;
private static final int SET_TILE_VISIBILITY = 2;
private static final int ANNOUNCE_FOR_ACCESSIBILITY = 3;
@Override
public void handleMessage(Message msg) {
if (msg.what == SHOW_DETAIL) {
handleShowDetail((Record)msg.obj, msg.arg1 != 0);
} else if (msg.what == ANNOUNCE_FOR_ACCESSIBILITY) {
announceForAccessibility((CharSequence)msg.obj);
}
}
}