summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sid Soundararajan <ssoundar@google.com> 2016-05-26 00:45:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-05-26 00:45:28 +0000
commit7cb7a0aa60f0f01fbcb5b5023f642c527f3f1985 (patch)
tree5b3dcef7d1f99d5000e2c6f306aa59c73a14e91a
parentdbcca24f8e239a34ededaef8a7fc924c196f98cb (diff)
parentcaa611f88d374f18ca229749760d10947fdac61a (diff)
Merge "Make content descriptions of task cards, the title description" into nyc-dev
-rw-r--r--packages/SystemUI/res/layout-television/recents_tv_task_card_view.xml1
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout-television/recents_tv_task_card_view.xml b/packages/SystemUI/res/layout-television/recents_tv_task_card_view.xml
index 08a1a93f05cb..201f47d4348c 100644
--- a/packages/SystemUI/res/layout-television/recents_tv_task_card_view.xml
+++ b/packages/SystemUI/res/layout-television/recents_tv_task_card_view.xml
@@ -19,7 +19,6 @@
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
- android:contentDescription="@string/status_bar_recent_inspect_item_title"
android:layout_gravity="center"
android:layout_centerInParent="true"
android:clipToPadding="false"
diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java
index 4eca5d56fc3e..758f93a5f5d5 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java
@@ -101,6 +101,7 @@ public class TaskCardView extends LinearLayout {
mTitleTextView.setText(task.title);
mBadgeView.setImageDrawable(task.icon);
setThumbnailView();
+ setContentDescription(task.titleDescription);
}
public Task getTask() {