Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df8f1ea authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reverts ag/1803954 and ag/1828349 and left only split custom action"

parents 3be1f6fd 32acecc0

packages/SystemUI/res/layout/recents_task_view_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:layout_gravity="top|center_horizontal">

    <com.android.systemui.recents.views.FixedSizeImageView

        android:id="@+id/icon"

        android:contentDescription="@string/recents_app_info_button_label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical|start"

packages/SystemUI/res/values/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -301,7 +301,5 @@ 
    <item type="id" name="action_split_task_to_left" />

    <item type="id" name="action_split_task_to_right" />

    <item type="id" name="action_split_task_to_top" />

    <item type="id" name="action_open" />

    <item type="id" name="action_dimiss" />



</resources>

packages/SystemUI/res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -794,10 +794,6 @@ 
    <string name="recents_multistack_add_stack_dialog_split_vertical">Split Vertical</string>

    <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->

    <string name="recents_multistack_add_stack_dialog_split_custom">Split Custom</string>

    <!-- Recents: Accessibility dismiss label -->

    <string name="recents_accessibility_dismissed">Dismiss</string>

    <!-- Recents: Accessibility open label -->

    <string name="recents_accessibility_open">Open</string>

    <!-- Recents: Accessibility split to the top -->

    <string name="recents_accessibility_split_screen_top">Split screen to the top</string>

    <!-- Recents: Accessibility split to the left -->

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+0 −5
Original line number Diff line number Diff line
@@ -257,11 +257,6 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks 
        }

    }



    @Override

    public void addChildrenForAccessibility(ArrayList<View> outChildren) {

        // Prevent any children from being focusable during talkback

    }



    @Override

    public boolean hasOverlappingRendering() {

        return false;

packages/SystemUI/src/com/android/systemui/recents/views/TaskViewAccessibilityDelegate.java

+2 −14
Original line number Diff line number Diff line
@@ -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);