Add contentDescriptions to PreferenceCategoryWithButton icons

BUG=446372

Review URL: https://codereview.chromium.org/807683003

Cr-Commit-Position: refs/heads/master@{#310229}

2 files changed, 17 insertions, 1 deletions

diff --git a/chrome/android/java/res/xml/autofill_preferences.xml b/chrome/android/java/res/xml/autofill_preferences.xml
index c2e0eb7..ee73d31 100644
--- a/chrome/android/java/res/xml/autofill_preferences.xml
+++ b/chrome/android/java/res/xml/autofill_preferences.xml
@@ -15,6 +15,7 @@
        android:enabled="true"
        android:title="@string/autofill_profiles_title"
        android:fragment="org.chromium.chrome.browser.preferences.autofill.AutofillProfileEditor"
+       android:contentDescription="@string/autofill_create_profile"
        />
 
     <org.chromium.chrome.browser.preferences.PreferenceCategoryWithButton
@@ -22,6 +23,7 @@
        android:enabled="true"
        android:title="@string/autofill_credit_cards_title"
        android:fragment="org.chromium.chrome.browser.preferences.autofill.AutofillCreditCardEditor"
+       android:contentDescription="@string/autofill_create_credit_card"
        />
 
 </PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceCategoryWithButton.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceCategoryWithButton.java
index 61521a0..adab1a8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceCategoryWithButton.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferenceCategoryWithButton.java
@@ -5,8 +5,10 @@
 package org.chromium.chrome.browser.preferences;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -20,10 +22,17 @@ import org.chromium.chrome.R;
  */
 public class PreferenceCategoryWithButton extends PreferenceGroup implements OnClickListener {
 
+    private String mContentDescription;
+
     public PreferenceCategoryWithButton(Context context, AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.preference_category);
         setSelectable(false);
+
+        TypedArray a = context.obtainStyledAttributes(attrs,
+                new int[] {android.R.attr.contentDescription});
+        mContentDescription = a.getString(0);
+        a.recycle();
     }
 
     @Override
@@ -33,7 +42,12 @@ public class PreferenceCategoryWithButton extends PreferenceGroup implements OnC
         // which needs a top padding of 16dp; we don't want this top padding for
         // PreferenceCategoryWithButton views.
         view.setPadding(view.getPaddingLeft(), 0, view.getPaddingRight(), view.getPaddingBottom());
-        view.findViewById(android.R.id.icon).setOnClickListener(this);
+        View button = view.findViewById(android.R.id.icon);
+        button.setOnClickListener(this);
+
+        if (!TextUtils.isEmpty(mContentDescription)) {
+            button.setContentDescription(mContentDescription);
+        }
     }
 
     @Override