From 72800a937310cecd988a8f0fd47db54f92cfcbca Mon Sep 17 00:00:00 2001
From: Matthew Ng <ngmatthew@google.com>
Date: Tue, 24 Jan 2017 15:10:34 -0800
Subject: [PATCH] Remove accessibility labels of application info and dimiss

After moving application info and dismiss actions into custom actions
this will remove the talkback options by removing their labels.

Test: listened to options with talkback
Fixes: 29360763
Change-Id: Ia2cc788b22d1fcede58cb43cdbfe23c055604105
---
 packages/SystemUI/res/layout/recents_task_view_header.xml       | 1 -
 .../src/com/android/systemui/recents/views/TaskViewHeader.java  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/recents_task_view_header.xml b/packages/SystemUI/res/layout/recents_task_view_header.xml
index 5ee242dc314ca..789b765486fe6 100644
--- a/packages/SystemUI/res/layout/recents_task_view_header.xml
+++ b/packages/SystemUI/res/layout/recents_task_view_header.xml
@@ -23,7 +23,6 @@
     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"
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 0777163293d93..b318ea72d94e5 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
@@ -462,7 +462,6 @@ 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);
@@ -499,7 +498,6 @@ 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);
         }