From 779536081ca2c9fd2c3b457289c4f24d2756f281 Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Mon, 10 Mar 2014 21:35:32 -0700 Subject: [PATCH] Bug 974627 - Empty contentDescription throughout. r=rnewman --- mobile/android/base/locales/en-US/sync_strings.dtd | 7 ------- .../base/resources/layout/fxaccount_account_verified.xml | 6 +++--- .../base/resources/layout/fxaccount_confirm_account.xml | 6 +++--- .../base/resources/layout/fxaccount_create_account.xml | 2 +- .../layout/fxaccount_create_account_not_allowed.xml | 2 +- .../base/resources/layout/fxaccount_get_started.xml | 6 +++--- mobile/android/base/resources/layout/fxaccount_sign_in.xml | 4 ++-- .../base/resources/layout/fxaccount_update_credentials.xml | 4 ++-- mobile/android/services/strings.xml.in | 7 +++---- 9 files changed, 18 insertions(+), 26 deletions(-) diff --git a/mobile/android/base/locales/en-US/sync_strings.dtd b/mobile/android/base/locales/en-US/sync_strings.dtd index 3885aeac8a4..2fc5e8d49a2 100644 --- a/mobile/android/base/locales/en-US/sync_strings.dtd +++ b/mobile/android/base/locales/en-US/sync_strings.dtd @@ -107,13 +107,6 @@ - - - - - - diff --git a/mobile/android/base/resources/layout/fxaccount_account_verified.xml b/mobile/android/base/resources/layout/fxaccount_account_verified.xml index 3f863bface4..c72d58cbefb 100644 --- a/mobile/android/base/resources/layout/fxaccount_account_verified.xml +++ b/mobile/android/base/resources/layout/fxaccount_account_verified.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginBottom="45dp" - android:contentDescription="@string/fxaccount_checkbox_contentDescription" + android:contentDescription="@string/fxaccount_empty_contentDescription" android:src="@drawable/fxaccount_checkbox" > @@ -40,7 +40,7 @@ + android:contentDescription="@string/fxaccount_empty_contentDescription" /> - \ No newline at end of file + diff --git a/mobile/android/base/resources/layout/fxaccount_confirm_account.xml b/mobile/android/base/resources/layout/fxaccount_confirm_account.xml index 4b6f538710d..daf10a90b20 100644 --- a/mobile/android/base/resources/layout/fxaccount_confirm_account.xml +++ b/mobile/android/base/resources/layout/fxaccount_confirm_account.xml @@ -24,7 +24,7 @@ android:layout_gravity="center_horizontal" android:layout_marginBottom="40dp" android:background="@android:color/transparent" - android:contentDescription="@string/fxaccount_mail_contentDescription" + android:contentDescription="@string/fxaccount_empty_contentDescription" android:src="@drawable/fxaccount_mail" > @@ -49,7 +49,7 @@ + android:contentDescription="@string/fxaccount_empty_contentDescription" /> - \ No newline at end of file + diff --git a/mobile/android/base/resources/layout/fxaccount_create_account.xml b/mobile/android/base/resources/layout/fxaccount_create_account.xml index ed0be40e6d0..d339e770faf 100644 --- a/mobile/android/base/resources/layout/fxaccount_create_account.xml +++ b/mobile/android/base/resources/layout/fxaccount_create_account.xml @@ -88,7 +88,7 @@ + android:contentDescription="@string/fxaccount_empty_contentDescription" /> diff --git a/mobile/android/base/resources/layout/fxaccount_create_account_not_allowed.xml b/mobile/android/base/resources/layout/fxaccount_create_account_not_allowed.xml index 23bae1d119b..5efc077eefb 100644 --- a/mobile/android/base/resources/layout/fxaccount_create_account_not_allowed.xml +++ b/mobile/android/base/resources/layout/fxaccount_create_account_not_allowed.xml @@ -36,7 +36,7 @@ + android:contentDescription="@string/fxaccount_empty_contentDescription" /> diff --git a/mobile/android/base/resources/layout/fxaccount_get_started.xml b/mobile/android/base/resources/layout/fxaccount_get_started.xml index b7e8bf85fda..e40c70cb0bf 100644 --- a/mobile/android/base/resources/layout/fxaccount_get_started.xml +++ b/mobile/android/base/resources/layout/fxaccount_get_started.xml @@ -26,7 +26,7 @@ android:layout_gravity="center_horizontal" android:layout_marginBottom="30dp" android:layout_marginTop="30dp" - android:contentDescription="@string/fxaccount_intro_contentDescription" + android:contentDescription="@string/fxaccount_empty_contentDescription" android:src="@drawable/fxaccount_intro" > @@ -49,7 +49,7 @@ + android:contentDescription="@string/fxaccount_empty_contentDescription" /> - \ No newline at end of file + diff --git a/mobile/android/base/resources/layout/fxaccount_sign_in.xml b/mobile/android/base/resources/layout/fxaccount_sign_in.xml index 3bb85d7ff0c..5f7cde34cc3 100644 --- a/mobile/android/base/resources/layout/fxaccount_sign_in.xml +++ b/mobile/android/base/resources/layout/fxaccount_sign_in.xml @@ -76,7 +76,7 @@ + android:contentDescription="@string/fxaccount_empty_contentDescription" /> - \ No newline at end of file + diff --git a/mobile/android/base/resources/layout/fxaccount_update_credentials.xml b/mobile/android/base/resources/layout/fxaccount_update_credentials.xml index 611398eef52..8b628fc7df6 100644 --- a/mobile/android/base/resources/layout/fxaccount_update_credentials.xml +++ b/mobile/android/base/resources/layout/fxaccount_update_credentials.xml @@ -51,7 +51,7 @@ + android:contentDescription="@string/fxaccount_empty_contentDescription" /> - \ No newline at end of file + diff --git a/mobile/android/services/strings.xml.in b/mobile/android/services/strings.xml.in index 87d44978e76..ee2b0fc0cdf 100644 --- a/mobile/android/services/strings.xml.in +++ b/mobile/android/services/strings.xml.in @@ -111,10 +111,9 @@ https://accounts.firefox.com/legal/privacy https://accounts.firefox.com/reset_password -&fxaccount_checkbox_contentDescription2; -&fxaccount_icon_contentDescription2; -&fxaccount_intro_contentDescription2; -&fxaccount_mail_contentDescription2; + + &fxaccount_email_hint; &fxaccount_password_hint;