PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabling accessibility focus on all children when shortcuts is open

Browse Source 
am: 7d552c8b18

Change-Id: I92dbc4ad41109c79ed546e99895cfc1dada40732
This commit is contained in:
Sunny Goyal
2016-08-03 20:24:14 +00:00
committed by android-build-merger
parent af44e57d38 7d552c8b18
commit e3cda7fceb
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/dragndrop/DragLayer.java
+21 -11
View File
@@ -374,22 +374,32 @@ public class DragLayer extends InsettableFrameLayout {
@Override
public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
Folder currentFolder = mLauncher.getWorkspace().getOpenFolder();
if (currentFolder != null) {
if (child == currentFolder) {
return super.onRequestSendAccessibilityEvent(child, event);
}
// Shortcuts can appear above folder
View topView = mLauncher.getOpenShortcutsContainer();
if (topView != null) {
return handleTopViewSendAccessibilityEvent(topView, child, event);
}
if (isInAccessibleDrag() && child instanceof DropTargetBar) {
return super.onRequestSendAccessibilityEvent(child, event);
}
// Skip propagating onRequestSendAccessibilityEvent all for other children
// when a folder is open
return false;
topView = mLauncher.getWorkspace().getOpenFolder();
if (topView != null) {
return handleTopViewSendAccessibilityEvent(topView, child, event);
}
return super.onRequestSendAccessibilityEvent(child, event);
}
private boolean handleTopViewSendAccessibilityEvent(
View topView, View child, AccessibilityEvent event) {
if (child == topView) {
return super.onRequestSendAccessibilityEvent(child, event);
}
if (isInAccessibleDrag() && child instanceof DropTargetBar) {
return super.onRequestSendAccessibilityEvent(child, event);
}
// Skip propagating onRequestSendAccessibilityEvent for all other children
// which are not topView
return false;
}
@Override
public void addChildrenForAccessibility(ArrayList<View> childrenForAccessibility) {
Folder currentFolder = mLauncher.getWorkspace().getOpenFolder();