Add content description for expand name fields button
Bug: 7497403
Change-Id: Ie0bf0b4ef66b0e1c58b718bcc0d2fda1a2478bcf
diff --git a/res/layout/name_edit_expansion_view.xml b/res/layout/name_edit_expansion_view.xml
new file mode 100644
index 0000000..17ae263
--- /dev/null
+++ b/res/layout/name_edit_expansion_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- "More" or "less" expansion button in the contact editor. -->
+
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/editor_min_line_item_height"
+ android:layout_gravity="top"
+ android:contentDescription="@string/expand_collapse_name_fields_description"
+ android:importantForAccessibility="yes">
+ <ImageView
+ android:id="@+id/expansion_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:duplicateParentState="true"
+ android:background="?android:attr/selectableItemBackground"
+ android:paddingLeft="@dimen/editor_round_button_padding_left"
+ android:paddingRight="@dimen/editor_round_button_padding_right"
+ android:paddingTop="@dimen/editor_round_button_padding_top"
+ android:paddingBottom="@dimen/editor_round_button_padding_bottom" />
+</FrameLayout>
diff --git a/res/layout/phonetic_name_editor_view.xml b/res/layout/phonetic_name_editor_view.xml
index 5846998..3b7562b 100644
--- a/res/layout/phonetic_name_editor_view.xml
+++ b/res/layout/phonetic_name_editor_view.xml
@@ -40,7 +40,7 @@
<include
android:id="@+id/expansion_view_container"
- layout="@layout/edit_expansion_view"
+ layout="@layout/name_edit_expansion_view"
android:visibility="gone" />
<include
diff --git a/res/layout/structured_name_editor_view.xml b/res/layout/structured_name_editor_view.xml
index 3c5d5c9..d1eace8 100644
--- a/res/layout/structured_name_editor_view.xml
+++ b/res/layout/structured_name_editor_view.xml
@@ -38,7 +38,7 @@
<include
android:id="@+id/expansion_view_container"
- layout="@layout/edit_expansion_view"
+ layout="@layout/name_edit_expansion_view"
android:visibility="gone" />
<include
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d90d0ef..4e5b215 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1850,4 +1850,11 @@
[CHAR LIMIT=NONE] -->
<string name="action_menu_overflow_description" msgid="2295659037509008453">More options</string>
+ <!-- Content description for the expand or collapse name fields button.
+ Clicking this button causes the name editor to toggle between showing
+ a single field where the entire name is edited at once, or multiple
+ fields corresponding to each part of the name (Name Prefix, First Name,
+ Middle Name, Last Name, Name Suffix).
+ [CHAR LIMIT=NONE] -->
+ <string name="expand_collapse_name_fields_description">Expand or collapse name fields</string>
</resources>