Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev

This commit is contained in:
Adrian Roos
2017-01-04 00:01:04 +00:00
committed by Android (Google) Code Review

View File

@@ -345,7 +345,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);
@@ -518,10 +521,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);
}
}
}