aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/layout
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-04-17 12:06:55 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-04-17 17:43:34 +0900
commitbfc998096b506ab4813267bc47ff312a37fcef84 (patch)
tree548515282ef6b8590cb50821ce92107860048abf /java/res/layout
parent1c1d37caf94ce40d38d73e9c43b0561de49b648b (diff)
downloadlatinime-bfc998096b506ab4813267bc47ff312a37fcef84.tar.gz
latinime-bfc998096b506ab4813267bc47ff312a37fcef84.tar.xz
latinime-bfc998096b506ab4813267bc47ff312a37fcef84.zip
Add contentDescription to Emoji palette
This CL adds content descriptions of: - Emoji Category icon/label. - Delete key - Space key Bug: 11452158 Change-Id: Ic00592c560b6265c880cd25f2e18cfd349b4620b
Diffstat (limited to 'java/res/layout')
-rw-r--r--java/res/layout/emoji_keyboard_tab_icon.xml2
-rw-r--r--java/res/layout/emoji_palettes_view.xml6
-rw-r--r--java/res/layout/suggestion_divider.xml1
3 files changed, 7 insertions, 2 deletions
diff --git a/java/res/layout/emoji_keyboard_tab_icon.xml b/java/res/layout/emoji_keyboard_tab_icon.xml
index 1609f6a26..13bb41ca2 100644
--- a/java/res/layout/emoji_keyboard_tab_icon.xml
+++ b/java/res/layout/emoji_keyboard_tab_icon.xml
@@ -18,10 +18,12 @@
*/
-->
+<!-- Note: contentDescription will be added programatically in {@link EmojiPalettesView}. -->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_height="wrap_content"
android:gravity="center"
android:scaleType="center"
+ android:contentDescription="@null"
/>
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index ef565a4f8..552a474b4 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -71,7 +71,8 @@
android:layout_weight="12.5"
android:layout_height="match_parent"
android:background="@color/emoji_key_background_color"
- android:src="@drawable/sym_keyboard_delete_holo_dark" />
+ android:src="@drawable/sym_keyboard_delete_holo_dark"
+ android:contentDescription="@string/spoken_description_delete" />
</LinearLayout>
<android.support.v4.view.ViewPager
android:id="@+id/emoji_keyboard_pager"
@@ -99,7 +100,8 @@
android:id="@+id/emoji_keyboard_space"
android:layout_width="0dip"
android:layout_weight="0.70"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:contentDescription="@string/spoken_description_space"/>
<TextView
android:id="@+id/emoji_keyboard_alphabet_right"
android:layout_width="0dip"
diff --git a/java/res/layout/suggestion_divider.xml b/java/res/layout/suggestion_divider.xml
index a8b78c082..149095147 100644
--- a/java/res/layout/suggestion_divider.xml
+++ b/java/res/layout/suggestion_divider.xml
@@ -23,5 +23,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/suggestions_strip_divider"
+ android:contentDescription="@null"
android:padding="0dp"
android:gravity="center" />