wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 922daaaeb05a (bug 974627) for permament android s4 test failure

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-03-11 12:23:56 +01:00
parent af9a3e1a6b
commit baa754509b
9 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/android/base/locales/en-US/sync_strings.dtd
View File

@ -107,6 +107,13 @@
<!-- 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. -->

6
mobile/android/base/resources/layout/fxaccount_account_verified.xml
View File

@ -21,7 +21,7 @@
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>
@ -40,7 +40,7 @@
<ImageView
style="@style/FxAccountIcon"
android:contentDescription="@string/fxaccount_empty_contentDescription" />
android:contentDescription="@string/fxaccount_icon_contentDescription" />
</LinearLayout>
</ScrollView>
</ScrollView>

6
mobile/android/base/resources/layout/fxaccount_confirm_account.xml
View File

@ -24,7 +24,7 @@
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>
@ -49,7 +49,7 @@
<ImageView
style="@style/FxAccountIcon"
android:contentDescription="@string/fxaccount_empty_contentDescription" />
android:contentDescription="@string/fxaccount_icon_contentDescription" />
</LinearLayout>
</ScrollView>
</ScrollView>

2
mobile/android/base/resources/layout/fxaccount_create_account.xml
View File

@ -88,7 +88,7 @@
<ImageView
style="@style/FxAccountIcon"
android:contentDescription="@string/fxaccount_empty_contentDescription" />
android:contentDescription="@string/fxaccount_icon_contentDescription" />
</LinearLayout>
</ScrollView>

2
mobile/android/base/resources/layout/fxaccount_create_account_not_allowed.xml
View File

@ -36,7 +36,7 @@
<ImageView
style="@style/FxAccountIcon"
android:contentDescription="@string/fxaccount_empty_contentDescription" />
android:contentDescription="@string/fxaccount_icon_contentDescription" />
</LinearLayout>
</ScrollView>

6
mobile/android/base/resources/layout/fxaccount_get_started.xml
View File

@ -26,7 +26,7 @@
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>
@ -49,7 +49,7 @@
<ImageView
style="@style/FxAccountIcon"
android:contentDescription="@string/fxaccount_empty_contentDescription" />
android:contentDescription="@string/fxaccount_icon_contentDescription" />
</LinearLayout>
</ScrollView>
</ScrollView>

4
mobile/android/base/resources/layout/fxaccount_sign_in.xml
View File

@ -76,7 +76,7 @@
<ImageView
style="@style/FxAccountIcon"
android:contentDescription="@string/fxaccount_empty_contentDescription" />
android:contentDescription="@string/fxaccount_icon_contentDescription" />
</LinearLayout>
</ScrollView>
</ScrollView>

4
mobile/android/base/resources/layout/fxaccount_update_credentials.xml
View File

@ -51,7 +51,7 @@
<ImageView
style="@style/FxAccountIcon"
android:contentDescription="@string/fxaccount_empty_contentDescription" />
android:contentDescription="@string/fxaccount_icon_contentDescription" />
</LinearLayout>
</ScrollView>
</ScrollView>

7
mobile/android/services/strings.xml.in
View File

@ -111,9 +111,10 @@
<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>