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

Commit a4cc9660 authored by Winson Chung's avatar Winson Chung
Browse files

Adding content description for task view buttons.

parent 48e28ad0

packages/SystemUI/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
    <!-- The recents task bar light dismiss icon color to be drawn on top of dark backgrounds. -->

    <color name="recents_task_bar_light_dismiss_color">#ffeeeeee</color>

    <!-- The recents task bar dark dismiss icon color to be drawn on top of light backgrounds. -->

    <color name="recents_task_bar_dark_dismiss_color">#cc000000</color>

    <color name="recents_task_bar_dark_dismiss_color">#99000000</color>

    <!-- The recents task bar highlight color. -->

    <color name="recents_task_bar_highlight_color">#28ffffff</color>

    <!-- The lock to task button background color. -->

packages/SystemUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -380,8 +380,12 @@ 
    <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_ringer_silent">Ringer silent.</string>



    <!-- Content description to tell the user that this button will remove an application from recents -->

    <string name="accessibility_recents_item_will_be_dismissed">Dismiss <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>

    <!-- Content description to tell the user an application has been removed from recents -->

    <string name="accessibility_recents_item_dismissed"><xliff:g id="app" example="Calendar">%s</xliff:g> dismissed.</string>

    <!-- Content description to tell the user an application has been launched from recents -->

    <string name="accessibility_recents_item_launched">Starting <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>

    <!-- Content description to tell the user a notification has been removed from the notification shade -->

    <string name="accessibility_notification_dismissed">Notification dismissed.</string>

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

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ class TaskBarView extends FrameLayout { 
        } else if (t.applicationIcon != null) {

            mApplicationIcon.setImageDrawable(t.applicationIcon);

        }

        mApplicationIcon.setContentDescription(t.activityLabel);

        if (!mActivityDescription.getText().toString().equals(t.activityLabel)) {

            mActivityDescription.setText(t.activityLabel);

        }
@@ -176,6 +177,9 @@ class TaskBarView extends FrameLayout { 
                mConfig.taskBarViewLightTextColor : mConfig.taskBarViewDarkTextColor);

        mDismissButton.setImageDrawable(t.useLightOnPrimaryColor ?

                mLightDismissDrawable : mDarkDismissDrawable);

        mDismissButton.setContentDescription(

                getContext().getString(R.string.accessibility_recents_item_will_be_dismissed,

                        t.activityLabel));

    }



    /** Unbinds the bar view from the task */

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

+2 −2
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ import android.graphics.Rect; 
import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.View;

import android.view.accessibility.AccessibilityEvent;

import android.widget.FrameLayout;

import android.widget.OverScroller;

import com.android.systemui.R;

import com.android.systemui.recents.Constants;

import com.android.systemui.recents.RecentsConfiguration;

import com.android.systemui.recents.misc.Console;

import com.android.systemui.recents.misc.DozeTrigger;

import com.android.systemui.recents.misc.ReferenceCountedTrigger;

import com.android.systemui.recents.misc.Utilities;