Bug 1411198 - Unlabeled voice input button. r?xxxx
Added contentDescription strings for QR Code and Voice Input
MozReview-Commit-ID: 6tpoewhPxev
--- a/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml
+++ b/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:gecko="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- tools:background="@android:color/holo_green_light"
- tools:layout_height="@dimen/browser_toolbar_height"
- tools:layout_width="match_parent"
- tools:orientation="horizontal"
- tools:parentTag="LinearLayout">
+ xmlns:gecko="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:background="@android:color/holo_green_light"
+ tools:layout_height="@dimen/browser_toolbar_height"
+ tools:layout_width="match_parent"
+ tools:orientation="horizontal"
+ tools:parentTag="LinearLayout">
<org.mozilla.gecko.widget.themed.ThemedLinearLayout
android:id="@+id/url_bar_title_bg"
style="@style/UrlBar.ThemeBackground"
android:layout_width="0dp"
android:layout_height="@dimen/browser_toolbar_url_height"
android:layout_weight="1"
android:layout_gravity="center_vertical"
@@ -45,18 +45,20 @@
android:selectAllOnFocus="true"/>
</org.mozilla.gecko.widget.themed.ThemedLinearLayout>
<org.mozilla.gecko.toolbar.ToolbarRoundButton
android:id="@+id/qrcode"
style="@style/UrlBar.QRCode"
android:background="@drawable/url_bar_action_button"
android:src="@drawable/ic_qrcode"
+ android:contentDescription="@string/url_bar_qrcode_text"
gecko:showLWTBackground="true"/>
<org.mozilla.gecko.toolbar.ToolbarRoundButton
android:id="@+id/mic"
style="@style/UrlBar.ImageButton"
android:background="@drawable/url_bar_action_button"
android:src="@drawable/ic_mic"
+ android:contentDescription="@string/url_bar_mic_text"
gecko:showLWTBackground="true"/>
</merge>
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -64,16 +64,18 @@
<!ENTITY crash_allow_contact2 "Allow &vendorShortName; to contact me about this report">
<!ENTITY crash_email "Your email">
<!ENTITY crash_closing_alert "Exit without sending a crash report?">
<!ENTITY sending_crash_report "Sending crash report\u2026">
<!ENTITY crash_close_label "Close">
<!ENTITY crash_restart_label "Restart &brandShortName;">
<!ENTITY url_bar_default_text2 "Search or enter address">
+<!ENTITY url_bar_qrcode_text2 "Use QR Code to view website">
+<!ENTITY url_bar_mic_text2 "Use microphone to enter address">
<!ENTITY bookmark "Bookmark">
<!ENTITY bookmark_remove "Remove bookmark">
<!ENTITY bookmark_added "Bookmark added">
<!-- Localization note (bookmark_already_added) : This string is
used as a label in a toast. It is the verb "to bookmark", not
the noun "a bookmark". -->
<!ENTITY bookmark_already_added "Already bookmarked">
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -66,16 +66,18 @@
<string name="crash_allow_contact2">&crash_allow_contact2;</string>
<string name="crash_email">&crash_email;</string>
<string name="crash_closing_alert">&crash_closing_alert;</string>
<string name="sending_crash_report">&sending_crash_report;</string>
<string name="crash_close_label">&crash_close_label;</string>
<string name="crash_restart_label">&crash_restart_label;</string>
<string name="url_bar_default_text">&url_bar_default_text2;</string>
+ <string name="url_bar_qrcode_text">&url_bar_qrcode_text2;</string>
+ <string name="url_bar_mic_text">&url_bar_mic_text2;</string>
<!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/mobile-help -->
<string name="help_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/mobile-help</string>
<string name="help_menu">&help_menu;</string>
<string name="quit">&quit;</string>
<string name="bookmark">&bookmark;</string>
<string name="bookmark_remove">&bookmark_remove;</string>