From d21c3ad4554eeb27c29c7588a5360656d1acb033 Mon Sep 17 00:00:00 2001
From: Chiao Cheng <chiaocheng@google.com>
Date: Fri, 4 Oct 2013 16:13:26 -0700
Subject: Add content description for dismiss badge button.

Also re-using same description for dismiss button on tool tip.

Bug: 11067802
Change-Id: I63c922bd1b753d96b3d73a9cfa9d86772788e03f
---
 res/layout/call_log_list_item_extra.xml      |  3 ++-
 res/layout/tile_interactions_teaser_view.xml | 19 +++++++++++++++++--
 res/values/strings.xml                       |  3 +++
 3 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/layout/call_log_list_item_extra.xml b/res/layout/call_log_list_item_extra.xml
index d3f86cfea..fbf71f64d 100644
--- a/res/layout/call_log_list_item_extra.xml
+++ b/res/layout/call_log_list_item_extra.xml
@@ -53,6 +53,7 @@
                    android:paddingTop="8dip"
                    android:src="@drawable/ic_close_dk"
                    android:background="?android:attr/selectableItemBackground"
-                   android:visibility="gone"/>
+                   android:visibility="gone"
+                   android:contentDescription="@string/description_dismiss"/>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/tile_interactions_teaser_view.xml b/res/layout/tile_interactions_teaser_view.xml
index ee2b97495..c329dd32c 100644
--- a/res/layout/tile_interactions_teaser_view.xml
+++ b/res/layout/tile_interactions_teaser_view.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013 Google Inc. -->
+<!--
+  ~ Copyright (C) 2013 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
+  -->
 <com.android.dialer.list.TileInteractionTeaserView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -56,7 +70,8 @@
             android:clickable="true"
             android:scaleType="center"
             android:src="@drawable/ic_cancel_holo_light"
-            style="@style/DismissButtonStyle" />
+            style="@style/DismissButtonStyle"
+            android:contentDescription="@string/description_dismiss"/>
 
     </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 98e5b434c..55cdea4de 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -632,4 +632,7 @@
          [CHAR LIMIT=NONE]
     -->
     <string name="contact_tooltip">Tap image to see all numbers or press and hold to reorder</string>
+
+    <!-- Content description for dismiss button on badge. [CHAR LIMIT=NONE] -->
+    <string name="description_dismiss">Dismiss</string>
 </resources>
-- 
cgit v1.2.3