Expose accessible descriptions on Android.

content/browser/accessibility/browser_accessibility_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/accessibility/browser_accessibility_android.h"
 
 #include "base/i18n/break_iterator.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 329 matching lines @@
     if (InternalChildCount() > 0 && !HasOnlyStaticTextChildren())
       return base::string16();
   }
 
   // We can only expose one accessible name on Android,
   // not 2 or 3 like on Windows or Mac.
 
   // First, always return the |value| attribute if this is an
   // input field.
   base::string16 value = GetValue();
-  if (!value.empty()) {
-    if (HasState(ui::AX_STATE_EDITABLE))
-      return value;
-
-    switch (GetRole()) {
-      case ui::AX_ROLE_COMBO_BOX:
-      case ui::AX_ROLE_POP_UP_BUTTON:
-      case ui::AX_ROLE_TEXT_FIELD:
-        return value;
-    }
-  }
+  if (!value.empty() && ShouldExposeValueAsName())

[David Tseng, 2016/03/17 22:55:15]

So, in the Android world, text is same as name?

What happens with text fields with a value and a name? Do we only show the value
in that case?

+    return value;
 
   // For color wells, the color is stored in separate attributes.
   // Perhaps we could return color names in the future?

[David Tseng, 2016/03/17 22:55:15]

Unrelated; this begs to be made into a TODO with a bug?

   if (GetRole() == ui::AX_ROLE_COLOR_WELL) {
     int color = GetIntAttribute(ui::AX_ATTR_COLOR_VALUE);
     int red = (color >> 16) & 0xFF;
     int green = (color >> 8) & 0xFF;
     int blue = color & 0xFF;
     return base::UTF8ToUTF16(
         base::StringPrintf("#%02X%02X%02X", red, green, blue));
   }
 
   base::string16 text = GetString16Attribute(ui::AX_ATTR_NAME);
-  base::string16 description = GetString16Attribute(ui::AX_ATTR_DESCRIPTION);
-  if (!description.empty()) {
-    if (!text.empty())
-      text += base::ASCIIToUTF16(" ");
-    text += description;
-  }
-
   if (text.empty())
     text = value;
 
   // This is called from PlatformIsLeaf, so don't call PlatformChildCount
   // from within this!
   if (text.empty() &&
       (HasOnlyStaticTextChildren() ||
        (IsFocusable() && HasOnlyTextAndImageChildren()))) {
     for (uint32_t i = 0; i < InternalChildCount(); i++) {
       BrowserAccessibility* child = InternalGetChild(i);
@@ skipping 17 matching lines @@
       url = url.substr(slash_index + 1);
     size_t dot_index = url.rfind('.');
     if (dot_index != std::string::npos)
       url = url.substr(0, dot_index);
     text = url;
   }
 
   return text;
 }
 
+base::string16 BrowserAccessibilityAndroid::GetDescription() const {
+  // If we're returning the value as the main text, then return the
+  // accessible name as the only accessible text.

[David Tseng, 2016/03/17 22:55:15]

Can you reword this last part? Accessible text or description?

+  base::string16 value = GetValue();
+  if (!value.empty() && ShouldExposeValueAsName())

[David Tseng, 2016/03/17 22:55:15]

Can you move this non-empty value check into ShouldExposeValueAsName method?

+    return GetString16Attribute(ui::AX_ATTR_NAME);
+
+  return GetString16Attribute(ui::AX_ATTR_DESCRIPTION);
+}
+
 base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
   content::ContentClient* content_client = content::GetContentClient();
 
   // As a special case, if we have a heading level return a string like
   // "heading level 1", etc.
   if (GetRole() == ui::AX_ROLE_HEADING) {
     int level = GetIntAttribute(ui::AX_ATTR_HIERARCHICAL_LEVEL);
     if (level >= 1 && level <= 6) {
       std::vector<base::string16> values;
       values.push_back(base::IntToString16(level));
@@ skipping 907 matching lines @@
     }
   }
   return true;
 }
 
 bool BrowserAccessibilityAndroid::IsIframe() const {
   return (GetRole() == ui::AX_ROLE_IFRAME ||
           GetRole() == ui::AX_ROLE_IFRAME_PRESENTATIONAL);
 }
 
+bool BrowserAccessibilityAndroid::ShouldExposeValueAsName() const {
+  if (HasState(ui::AX_STATE_EDITABLE))
+    return true;
+
+  switch (GetRole()) {
+    case ui::AX_ROLE_COMBO_BOX:
+    case ui::AX_ROLE_POP_UP_BUTTON:
+    case ui::AX_ROLE_TEXT_FIELD:
+      return true;
+  }
+
+  return false;
+}
+
 void BrowserAccessibilityAndroid::OnDataChanged() {
   BrowserAccessibility::OnDataChanged();
 
   if (IsEditableText()) {
     base::string16 value = GetValue();
     if (value != new_value_) {
       old_value_ = new_value_;
       new_value_ = value;
     }
   }
@@ skipping 29 matching lines @@
 int BrowserAccessibilityAndroid::CountChildrenWithRole(ui::AXRole role) const {
   int count = 0;
   for (uint32_t i = 0; i < PlatformChildCount(); i++) {
     if (PlatformGetChild(i)->GetRole() == role)
       count++;
   }
   return count;
 }
 
 }  // namespace content