Backed out changeset 922daaaeb05a (bug 974627) for permament android s4 test failure
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 11 Mar 2014 12:23:56 +0100
changeset 191213 f39b957050c56ce64932b185d86a279af9c2f78c
parent 191212 15b0a825f153f04ab433f5fc1b99b91d98b877a1
child 191214 bc6ab94ec2a6deab576e1a5a4911621b8d17317f
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs974627
milestone30.0a1
backs out922daaaeb05ac2efafc920e0984cd9ad4363595d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 922daaaeb05a (bug 974627) for permament android s4 test failure
mobile/android/base/locales/en-US/sync_strings.dtd
mobile/android/base/resources/layout/fxaccount_account_verified.xml
mobile/android/base/resources/layout/fxaccount_confirm_account.xml
mobile/android/base/resources/layout/fxaccount_create_account.xml
mobile/android/base/resources/layout/fxaccount_create_account_not_allowed.xml
mobile/android/base/resources/layout/fxaccount_get_started.xml
mobile/android/base/resources/layout/fxaccount_sign_in.xml
mobile/android/base/resources/layout/fxaccount_update_credentials.xml
mobile/android/services/strings.xml.in
--- a/mobile/android/base/locales/en-US/sync_strings.dtd
+++ b/mobile/android/base/locales/en-US/sync_strings.dtd
@@ -102,16 +102,23 @@
 <!ENTITY sync.button.set.up.sync.label 'Set up &syncBrand.shortName.label;'>
 <!ENTITY sync.title.redirect.to.set.up.sync.label 'Set up &syncBrand.shortName.label; to send tabs'>
 <!ENTITY sync.text.redirect.to.set.up.sync.label 'Set up &syncBrand.fullName.label; on your device to send tabs to other devices.'>
 <!ENTITY sync.text.tab.sent.label 'Your tab was sent!'>
 <!ENTITY sync.text.tab.not.sent.label 'There was a problem sending your tab.'>
 
 <!-- Firefox account strings. -->
 
+<!-- Localization note: these describe icons and graphics, and are
+     consumed by assistive devices. -->
+<!ENTITY fxaccount_checkbox_contentDescription2 'Firefox accounts checkbox graphic'>
+<!ENTITY fxaccount_icon_contentDescription2 'Firefox accounts icon'>
+<!ENTITY fxaccount_intro_contentDescription2 'Firefox accounts introduction graphics'>
+<!ENTITY fxaccount_mail_contentDescription2 'Firefox accounts envelope graphic'>
+
 <!-- Localization note: these are shown in all screens that query the
      user for an email address and password. Hide and show are button
      labels. -->
 <!ENTITY fxaccount_email_hint 'Email'>
 <!ENTITY fxaccount_password_hint 'Password'>
 <!ENTITY fxaccount_password_hide 'Hide'>
 <!ENTITY fxaccount_password_show 'Show'>
 
--- a/mobile/android/base/resources/layout/fxaccount_account_verified.xml
+++ b/mobile/android/base/resources/layout/fxaccount_account_verified.xml
@@ -16,17 +16,17 @@
             android:text="@string/fxaccount_account_verified_sub_header" >
         </TextView>
 
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="45dp"
-            android:contentDescription="@string/fxaccount_empty_contentDescription"
+            android:contentDescription="@string/fxaccount_checkbox_contentDescription"
             android:src="@drawable/fxaccount_checkbox" >
         </ImageView>
 
         <TextView
             style="@style/FxAccountTextItem"
             android:layout_marginBottom="40dp"
             android:text="@string/fxaccount_account_verified_description"
             android:textSize="18sp" />
@@ -35,12 +35,12 @@
             android:id="@+id/button"
             style="@style/FxAccountButton"
             android:text="@string/fxaccount_back_to_browsing" />
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
-            android:contentDescription="@string/fxaccount_empty_contentDescription" />
+            android:contentDescription="@string/fxaccount_icon_contentDescription" />
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>
\ No newline at end of file
--- a/mobile/android/base/resources/layout/fxaccount_confirm_account.xml
+++ b/mobile/android/base/resources/layout/fxaccount_confirm_account.xml
@@ -19,17 +19,17 @@
         </TextView>
 
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="40dp"
             android:background="@android:color/transparent"
-            android:contentDescription="@string/fxaccount_empty_contentDescription"
+            android:contentDescription="@string/fxaccount_mail_contentDescription"
             android:src="@drawable/fxaccount_mail" >
         </ImageView>
 
         <TextView
             android:id="@+id/verification_link_text"
             style="@style/FxAccountTextItem"
             android:layout_marginBottom="40dp"
             android:text="@string/fxaccount_confirm_account_verification_link"
@@ -44,12 +44,12 @@
             android:id="@+id/resend_confirmation_email_link"
             style="@style/FxAccountLinkItem"
             android:text="@string/fxaccount_confirm_account_resend_email" />
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
-            android:contentDescription="@string/fxaccount_empty_contentDescription" />
+            android:contentDescription="@string/fxaccount_icon_contentDescription" />
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>
\ No newline at end of file
--- a/mobile/android/base/resources/layout/fxaccount_create_account.xml
+++ b/mobile/android/base/resources/layout/fxaccount_create_account.xml
@@ -83,12 +83,12 @@
             android:layout_marginTop="20dp"
             android:focusable="true"
             android:text="@string/fxaccount_create_account_sign_in_instead" />
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
-            android:contentDescription="@string/fxaccount_empty_contentDescription" />
+            android:contentDescription="@string/fxaccount_icon_contentDescription" />
     </LinearLayout>
 
 </ScrollView>
--- a/mobile/android/base/resources/layout/fxaccount_create_account_not_allowed.xml
+++ b/mobile/android/base/resources/layout/fxaccount_create_account_not_allowed.xml
@@ -31,12 +31,12 @@
             android:id="@+id/learn_more_link"
             style="@style/FxAccountLinkifiedItem"
             android:text="@string/fxaccount_account_create_not_allowed_learn_more" />
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
-            android:contentDescription="@string/fxaccount_empty_contentDescription" />
+            android:contentDescription="@string/fxaccount_icon_contentDescription" />
     </LinearLayout>
 
 </ScrollView>
--- a/mobile/android/base/resources/layout/fxaccount_get_started.xml
+++ b/mobile/android/base/resources/layout/fxaccount_get_started.xml
@@ -21,17 +21,17 @@
         </TextView>
 
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="30dp"
             android:layout_marginTop="30dp"
-            android:contentDescription="@string/fxaccount_empty_contentDescription"
+            android:contentDescription="@string/fxaccount_intro_contentDescription"
             android:src="@drawable/fxaccount_intro" >
         </ImageView>
 
         <TextView
             style="@style/FxAccountTextItem"
             android:text="@string/fxaccount_getting_started_description" >
         </TextView>
 
@@ -44,12 +44,12 @@
             android:id="@+id/old_firefox"
             style="@style/FxAccountLinkifiedItem"
             android:text="@string/fxaccount_getting_started_old_firefox" />
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
-            android:contentDescription="@string/fxaccount_empty_contentDescription" />
+            android:contentDescription="@string/fxaccount_icon_contentDescription" />
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>
\ No newline at end of file
--- a/mobile/android/base/resources/layout/fxaccount_sign_in.xml
+++ b/mobile/android/base/resources/layout/fxaccount_sign_in.xml
@@ -71,12 +71,12 @@
             android:layout_marginTop="10dp"
             android:text="@string/fxaccount_create_account_policy_text"
             android:textColorLink="@color/fxaccount_linkified_textColorLinkSubdued" />
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
-            android:contentDescription="@string/fxaccount_empty_contentDescription" />
+            android:contentDescription="@string/fxaccount_icon_contentDescription" />
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>
\ No newline at end of file
--- a/mobile/android/base/resources/layout/fxaccount_update_credentials.xml
+++ b/mobile/android/base/resources/layout/fxaccount_update_credentials.xml
@@ -46,12 +46,12 @@
             android:id="@+id/forgot_password_link"
             style="@style/FxAccountLinkifiedItem"
             android:text="@string/fxaccount_sign_in_forgot_password" />
 
         <LinearLayout style="@style/FxAccountSpacer" />
 
         <ImageView
             style="@style/FxAccountIcon"
-            android:contentDescription="@string/fxaccount_empty_contentDescription" />
+            android:contentDescription="@string/fxaccount_icon_contentDescription" />
     </LinearLayout>
 
-</ScrollView>
+</ScrollView>
\ No newline at end of file
--- a/mobile/android/services/strings.xml.in
+++ b/mobile/android/services/strings.xml.in
@@ -106,19 +106,20 @@
 <!-- Firefox account links. -->
 <!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/old-sync -->
 <string name="fxaccount_link_old_firefox">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/old-sync</string>
 <string name="fxaccount_link_create_not_allowed">http://www.consumer.ftc.gov/articles/0031-protecting-your-childs-privacy-online</string>
 <string name="fxaccount_link_tos">https://accounts.firefox.com/legal/terms</string>
 <string name="fxaccount_link_pn">https://accounts.firefox.com/legal/privacy</string>
 <string name="fxaccount_link_forgot_password">https://accounts.firefox.com/reset_password</string>
 
-<!-- Per Bug 974627, decorative images should not have non-empty
-     contentDescription text, and it should not be translated. -->
-<string name="fxaccount_empty_contentDescription"></string>
+<string name="fxaccount_checkbox_contentDescription">&fxaccount_checkbox_contentDescription2;</string>
+<string name="fxaccount_icon_contentDescription">&fxaccount_icon_contentDescription2;</string>
+<string name="fxaccount_intro_contentDescription">&fxaccount_intro_contentDescription2;</string>
+<string name="fxaccount_mail_contentDescription">&fxaccount_mail_contentDescription2;</string>
 
 <string name="fxaccount_email_hint">&fxaccount_email_hint;</string>
 <string name="fxaccount_password_hint">&fxaccount_password_hint;</string>
 <string name="fxaccount_password_hide">&fxaccount_password_hide;</string>
 <string name="fxaccount_password_show">&fxaccount_password_show;</string>
 
 <string name="fxaccount_back_to_browsing">&fxaccount_back_to_browsing;</string>