Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d46793e authored by Chiao Cheng's avatar Chiao Cheng Committed by Android (Google) Code Review
Browse files

Merge "Add content description for dismiss badge button." into klp-dev

parents 506ee390 d21c3ad4

res/layout/call_log_list_item_extra.xml

+2 −1
Original line number Diff line number Diff line
@@ -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

res/layout/tile_interactions_teaser_view.xml

+17 −2
Original line number Diff line number Diff line 
<?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>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>