Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b12ed1e10f

Change-Id: I2f17f2bd2f293f2c68ba20fbfd6aa3e693f8b865
This commit is contained in:
Adrian Roos
2016-12-28 23:58:43 +00:00
committed by android-build-merger
parent eb609a3d0f b12ed1e10f
commit 0a4e1b7078
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

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