summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-07-25 19:17:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-25 19:17:36 +0000
commit58385d11cddbdb2f8bb0f81f953549b84fe1caf4 (patch)
treeff266a5af8abdeac5f3539893291711585d801f0 /packages/SystemUI/src/com/android/systemui
parent3c92b947aeb30b0905e08a14843f28d2012cd0a6 (diff)
parenta4cc966050aeb406dbf3d9d262e281c40826e354 (diff)
downloadframeworks_base-58385d11cddbdb2f8bb0f81f953549b84fe1caf4.zip
frameworks_base-58385d11cddbdb2f8bb0f81f953549b84fe1caf4.tar.gz
frameworks_base-58385d11cddbdb2f8bb0f81f953549b84fe1caf4.tar.bz2
am f61f7bd8: Adding content description for task view buttons.
* commit 'f61f7bd82abae5232671f7a3624bc85438880e5f': Adding content description for task view buttons.
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/views/TaskBarView.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskBarView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskBarView.java
index fd636ed..dc8f0db 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskBarView.java
@@ -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 */
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index 32b9d8a..f7f96da 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -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;
@@ -1045,4 +1045,4 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
}
}
}
-} \ No newline at end of file
+}