diff options
| author | Chiao Cheng <chiaocheng@google.com> | 2013-10-07 11:43:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-07 11:43:15 -0700 |
| commit | babf47916706c82ae6aea8af017398249fe1f0ee (patch) | |
| tree | 857096dd7b862372f5bc5f2536f9e034be752130 /res | |
| parent | 8dc0d9b3a5194f380be736c89f3d92a5ea1f1cee (diff) | |
| parent | 22ebbd4545ea2bc68c9c28f0d26eaa987a538605 (diff) | |
am 22ebbd45: am 0d46793e: Merge "Add content description for dismiss badge button." into klp-dev
* commit '22ebbd4545ea2bc68c9c28f0d26eaa987a538605':
Add content description for dismiss badge button.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_log_list_item_extra.xml | 3 | ||||
| -rw-r--r-- | res/layout/tile_interactions_teaser_view.xml | 19 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
3 files changed, 22 insertions, 3 deletions
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> |