diff --git a/packages/SystemUI/res/layout/recents_task_view_header.xml b/packages/SystemUI/res/layout/recents_task_view_header.xml index 789b765486fe6..5ee242dc314ca 100644 --- a/packages/SystemUI/res/layout/recents_task_view_header.xml +++ b/packages/SystemUI/res/layout/recents_task_view_header.xml @@ -23,6 +23,7 @@ android:layout_gravity="top|center_horizontal"> - - diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 5d2117a73ea1f..d3e965aedc985 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -794,10 +794,6 @@ Split Vertical Split Custom - - Dismiss - - Open Split screen to the top diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java index e941c3bacfcb0..45e766c0dd16b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java @@ -257,11 +257,6 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks } } - @Override - public void addChildrenForAccessibility(ArrayList outChildren) { - // Prevent any children from being focusable during talkback - } - @Override public boolean hasOverlappingRendering() { return false; diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAccessibilityDelegate.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAccessibilityDelegate.java index 759daf1e0f124..2c3e78f8cb843 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAccessibilityDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAccessibilityDelegate.java @@ -18,7 +18,6 @@ package com.android.systemui.recents.views; import android.app.ActivityManager; import android.content.Context; -import android.content.res.Configuration; import android.graphics.Point; import android.os.Bundle; import android.util.SparseArray; @@ -29,6 +28,7 @@ import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import com.android.systemui.R; import com.android.systemui.recents.Recents; import com.android.systemui.recents.events.EventBus; +import com.android.systemui.recents.events.ui.ShowApplicationInfoEvent; import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent; import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent; import com.android.systemui.recents.misc.Utilities; @@ -39,8 +39,6 @@ public class TaskViewAccessibilityDelegate extends View.AccessibilityDelegate { private final TaskView mTaskView; - protected static final int OPEN = R.id.action_open; - protected static final int DIMISS = R.id.action_dimiss; protected static final int SPLIT_TASK_TOP = R.id.action_split_task_to_top; protected static final int SPLIT_TASK_LEFT = R.id.action_split_task_to_left; protected static final int SPLIT_TASK_RIGHT = R.id.action_split_task_to_right; @@ -50,10 +48,6 @@ public class TaskViewAccessibilityDelegate extends View.AccessibilityDelegate { public TaskViewAccessibilityDelegate(TaskView taskView) { mTaskView = taskView; Context context = taskView.getContext(); - mActions.put(OPEN, new AccessibilityAction(OPEN, - context.getString(R.string.recents_accessibility_open))); - mActions.put(DIMISS, new AccessibilityAction(DIMISS, - context.getString(R.string.recents_accessibility_dismissed))); mActions.put(SPLIT_TASK_TOP, new AccessibilityAction(SPLIT_TASK_TOP, context.getString(R.string.recents_accessibility_split_screen_top))); mActions.put(SPLIT_TASK_LEFT, new AccessibilityAction(SPLIT_TASK_LEFT, @@ -65,8 +59,6 @@ public class TaskViewAccessibilityDelegate extends View.AccessibilityDelegate { @Override public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfo(host, info); - info.addAction(mActions.get(OPEN)); - info.addAction(mActions.get(DIMISS)); if (ActivityManager.supportsSplitScreenMultiWindow() && !Recents.getSystemServices().hasDockedTask()) { TaskStack.DockState[] dockStates = Recents.getConfiguration() @@ -85,11 +77,7 @@ public class TaskViewAccessibilityDelegate extends View.AccessibilityDelegate { @Override public boolean performAccessibilityAction(View host, int action, Bundle args) { - if (action == OPEN) { - mTaskView.onClick(host); - } else if (action == DIMISS) { - mTaskView.dismissTask(); - } else if (action == SPLIT_TASK_TOP) { + if (action == SPLIT_TASK_TOP) { simulateDragIntoMultiwindow(TaskStack.DockState.TOP); } else if (action == SPLIT_TASK_LEFT) { simulateDragIntoMultiwindow(TaskStack.DockState.LEFT); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java index b318ea72d94e5..0777163293d93 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java @@ -462,6 +462,7 @@ public class TaskViewHeader extends FrameLayout mTaskBarViewLightTextColor : mTaskBarViewDarkTextColor); mDismissButton.setImageDrawable(t.useLightOnPrimaryColor ? mLightDismissDrawable : mDarkDismissDrawable); + mDismissButton.setContentDescription(t.dismissDescription); mDismissButton.setOnClickListener(this); mDismissButton.setClickable(false); ((RippleDrawable) mDismissButton.getBackground()).setForceSoftware(true); @@ -498,6 +499,7 @@ public class TaskViewHeader extends FrameLayout // In accessibility, a single click on the focused app info button will show it if (touchExplorationEnabled) { + mIconView.setContentDescription(t.appInfoDescription); mIconView.setOnClickListener(this); mIconView.setClickable(true); }