From abd2b2f3c32f372a30aea282a3a43be2ea7535c2 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Thu, 17 May 2018 13:56:35 -0700
Subject: Finishing touches for accessibility in the new call log and the new
 voicemail fragment

Bug: 70989658
Test: Manual
PiperOrigin-RevId: 197046549
Change-Id: I11f9515aad0b5d9c07ebb5d3ff480ed6751bd187
---
 .../ui/res/layout/new_call_log_duo_disclosure_card.xml      |  7 ++++---
 .../dialer/calllog/ui/res/layout/new_call_log_entry.xml     | 13 +++++++++----
 .../error/res/layout/voicemail_error_message_fragment.xml   |  4 +---
 .../voicemail/listui/res/layout/new_voicemail_entry.xml     |  3 +--
 .../listui/res/layout/new_voicemail_entry_alert.xml         |  4 +---
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
index a28101c6f..8084635d8 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_duo_disclosure_card.xml
@@ -18,8 +18,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/background_dialer_light">
+    android:background="@color/background_dialer_light"
+    android:orientation="vertical">
 
   <LinearLayout
       android:layout_width="match_parent"
@@ -35,7 +35,8 @@
         android:id="@+id/new_call_log_duo_disclosure_card_logo"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_marginEnd="16dp"/>
+        android:layout_marginEnd="16dp"
+        android:importantForAccessibility="no"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
index 7bd7f4f78..b022abbda 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
@@ -75,6 +75,7 @@
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
+          android:importantForAccessibility="no"
           android:src="@drawable/quantum_ic_hd_vd_theme_24"/>
 
       <ImageView
@@ -82,6 +83,7 @@
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
+          android:importantForAccessibility="no"
           android:src="@drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24"/>
 
       <ImageView
@@ -89,6 +91,7 @@
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
+          android:importantForAccessibility="no"
           android:src="@drawable/quantum_ic_language_vd_theme_24"/>
 
       <TextView
@@ -105,13 +108,15 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        tools:ignore="UseCompoundDrawables">
 
       <ImageView
           android:id="@+id/call_type_icon"
           android:layout_width="wrap_content"
           android:layout_height="18dp"
-          android:layout_gravity="center_vertical"/>
+          android:layout_gravity="center_vertical"
+          android:importantForAccessibility="no"/>
 
       <TextView
           android:id="@+id/secondary_text"
@@ -142,8 +147,8 @@
       android:layout_alignParentEnd="true"
       android:layout_centerVertical="true"
       android:background="?android:attr/selectableItemBackgroundBorderless"
+      android:contentDescription="@string/a11y_new_call_log_expand_menu_for_entry"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
-      android:tint="@color/dialer_secondary_text_color"
-      android:contentDescription="@string/a11y_new_call_log_expand_menu_for_entry"/>
+      android:tint="@color/dialer_secondary_text_color"/>
 </RelativeLayout>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml
index 7e74bae10..0a9b49c5d 100644
--- a/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml
@@ -15,7 +15,6 @@
 -->
 <android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/error_card"
     style="@style/CallLogCardStyle"
     android:gravity="center_vertical"
@@ -43,8 +42,7 @@
           android:layout_height="@dimen/voicemail_promo_card_icon_size"
           android:layout_gravity="top"
           android:importantForAccessibility="no"
-          android:src="@drawable/ic_voicemail_error_24px"
-          tools:ignore="ContentDescription"/>
+          android:src="@drawable/ic_voicemail_error_24px"/>
 
       <LinearLayout
           android:layout_width="match_parent"
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
index b880e0ffc..9a9e9ee0e 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
@@ -61,8 +61,7 @@
           android:importantForAccessibility="no"
           android:src="@drawable/quantum_ic_voicemail_vd_theme_24"
           android:tint="@color/dialtacts_theme_color"
-          android:tintMode="multiply"
-          tools:ignore="ContentDescription"/>
+          android:tintMode="multiply"/>
 
       <TextView
           android:id="@+id/secondary_text"
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
index c7029516b..fba39f1c7 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
@@ -18,7 +18,6 @@
 <!-- TODO(uabdullah): Use a relative layout instead of nested linear layouts.-->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/voicemail_alert_content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -40,8 +39,7 @@
         android:layout_height="@dimen/voicemail_promo_card_icon_size"
         android:layout_gravity="top"
         android:importantForAccessibility="no"
-        android:src="@drawable/ic_voicemail_error_24px"
-        tools:ignore="ContentDescription"/>
+        android:src="@drawable/ic_voicemail_error_24px"/>
 
     <LinearLayout
         android:layout_width="match_parent"
-- 
cgit v1.2.3