зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1220892 - Part 6: Remove non-string resources. r=mcomella
I'm reluctant to mass-delete strings, since that could cause our l10n team some grief in the event of a rollback. And it's not obviously easy to get them all back smoothly. I'll delete strings separately. --HG-- extra : commitid : 1EnkJkSQB0k extra : rebase_source : 44b5e61b90b41821d35ec8c0f30c7f508e58d716 extra : histedit_source : 285735259af6a7eb6d11f58834e2285f2c9b344b
This commit is contained in:
Nick Alexander
Родитель
c78ca48f65
Коммит
5cdc3a9ae1
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 536 B |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 248 B |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 3.4 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 2.2 KiB |
|
|
@ -1,19 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@android:color/white" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderActive" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius"
|
||||
android:topLeftRadius="@dimen/fxaccount_corner_radius"
|
||||
android:topRightRadius="0dp"
|
||||
android:bottomLeftRadius="@dimen/fxaccount_corner_radius"
|
||||
android:bottomRightRadius="0dp" />
|
||||
</shape>
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@color/fxaccount_password_hide_backgroundcolor" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderActive" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius"
|
||||
android:topLeftRadius="0dp"
|
||||
android:topRightRadius="@dimen/fxaccount_corner_radius"
|
||||
android:bottomLeftRadius="0dp"
|
||||
android:bottomRightRadius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@color/fxaccount_password_show_backgroundcolor" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderActive" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius"
|
||||
android:topLeftRadius="0dp"
|
||||
android:topRightRadius="@dimen/fxaccount_corner_radius"
|
||||
android:bottomLeftRadius="0dp"
|
||||
android:bottomRightRadius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@android:color/white" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderInactive" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius"
|
||||
android:topLeftRadius="@dimen/fxaccount_corner_radius"
|
||||
android:topRightRadius="0dp"
|
||||
android:bottomLeftRadius="@dimen/fxaccount_corner_radius"
|
||||
android:bottomRightRadius="0dp" />
|
||||
</shape>
|
||||
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 4.4 KiB |
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/fxaccount_button_background_pressed" />
|
||||
<item android:state_enabled="false"
|
||||
android:drawable="@drawable/fxaccount_button_background_disabled" />
|
||||
<item android:state_enabled="true"
|
||||
android:drawable="@drawable/fxaccount_button_background_enabled" />
|
||||
</selector>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle" >
|
||||
<solid android:color="@color/fxaccount_button_background_inactive" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle" >
|
||||
<solid android:color="@color/fxaccount_button_background_active" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle" >
|
||||
<solid android:color="@color/fxaccount_button_background_hit" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="@color/fxaccount_button_textColor" />
|
||||
</selector>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="@color/fxaccount_input_textColor_inactive" />
|
||||
<item android:state_pressed="true" android:color="@color/fxaccount_input_textColor_pressed" />
|
||||
<item android:color="@color/fxaccount_input_textColor" />
|
||||
</selector>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="@color/fxaccount_link_textColor_inactive" />
|
||||
<item android:state_pressed="true" android:color="@color/fxaccount_link_textColor_pressed" />
|
||||
<item android:color="@color/fxaccount_link_textColor" />
|
||||
</selector>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@android:color/white" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderActive" />
|
||||
<!-- On Android pre v12/3.0/Gingerbread, bottom left and bottom
|
||||
right are swapped. These values correct this bug; the resources
|
||||
that don't need correction are in res/drawable-v12. -->
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius"
|
||||
android:topLeftRadius="@dimen/fxaccount_corner_radius"
|
||||
android:topRightRadius="0dp"
|
||||
android:bottomLeftRadius="0dp"
|
||||
android:bottomRightRadius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:state_focused="false"
|
||||
android:drawable="@drawable/fxaccount_password_inactive" />
|
||||
<item
|
||||
android:drawable="@drawable/fxaccount_password_active" />
|
||||
</selector>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@color/fxaccount_password_hide_backgroundcolor" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderActive" />
|
||||
<!-- On Android pre v12/3.0/Gingerbread, bottom left and bottom
|
||||
right are swapped. These values correct this bug; the resources
|
||||
that don't need correction are in res/drawable-v12. -->
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius"
|
||||
android:topLeftRadius="0dp"
|
||||
android:topRightRadius="@dimen/fxaccount_corner_radius"
|
||||
android:bottomRightRadius="0dp"
|
||||
android:bottomLeftRadius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:drawable="@drawable/fxaccount_password_button_hide_active" />
|
||||
</selector>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@color/fxaccount_password_show_backgroundcolor" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderActive" />
|
||||
<!-- On Android pre v12/3.0/Gingerbread, bottom left and bottom
|
||||
right are swapped. These values correct this bug; the resources
|
||||
that don't need correction are in res/drawable-v12. -->
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius"
|
||||
android:topLeftRadius="0dp"
|
||||
android:topRightRadius="@dimen/fxaccount_corner_radius"
|
||||
android:bottomRightRadius="0dp"
|
||||
android:bottomLeftRadius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:drawable="@drawable/fxaccount_password_button_show_active" />
|
||||
</selector>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@android:color/white" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderInactive" />
|
||||
<!-- On Android pre v12/3.0/Gingerbread, bottom left and bottom
|
||||
right are swapped. These values correct this bug; the resources
|
||||
that don't need correction are in res/drawable-v12. -->
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius"
|
||||
android:topLeftRadius="@dimen/fxaccount_corner_radius"
|
||||
android:topRightRadius="0dp"
|
||||
android:bottomLeftRadius="0dp"
|
||||
android:bottomRightRadius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@android:color/white" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderActive" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:state_focused="false"
|
||||
android:drawable="@drawable/fxaccount_textfield_inactive" />
|
||||
<item
|
||||
android:drawable="@drawable/fxaccount_textfield_active" />
|
||||
</selector>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@android:color/white" />
|
||||
<stroke
|
||||
android:width="@dimen/fxaccount_stroke_width"
|
||||
android:color="@color/fxaccount_input_borderInactive" />
|
||||
<corners
|
||||
android:radius="@dimen/fxaccount_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?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/. -->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle" >
|
||||
<solid android:color="@color/fxaccount_error" />
|
||||
</shape>
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountMiddle" >
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
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:src="@drawable/fxaccount_checkbox" >
|
||||
</ImageView>
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountTextItem"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:text="@string/fxaccount_account_verified_description"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<Button
|
||||
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" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountMiddle" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
android:text="@string/fxaccount_confirm_account_header" >
|
||||
</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: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"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
style="@style/FxAccountButton"
|
||||
android:text="@string/fxaccount_back_to_browsing" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/resend_confirmation_email_link"
|
||||
style="@style/FxAccountLinkItem"
|
||||
android:text="@string/fxaccount_confirm_account_resend_email" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/change_confirmation_email_link"
|
||||
style="@style/FxAccountLinkItem"
|
||||
android:text="@string/fxaccount_confirm_account_change_email" />
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<ImageView
|
||||
style="@style/FxAccountIcon"
|
||||
android:contentDescription="@string/fxaccount_empty_contentDescription" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/create_account_view"
|
||||
style="@style/FxAccountMiddle" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
android:text="@string/fxaccount_create_account_header" />
|
||||
|
||||
<include layout="@layout/fxaccount_custom_server_view" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/remote_error"
|
||||
style="@style/FxAccountErrorItem" />
|
||||
|
||||
<include layout="@layout/fxaccount_email_password_view" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountTextItem"
|
||||
android:text="@string/fxaccount_create_account_password_length_restriction"
|
||||
android:textColor="@color/fxaccount_textColorSubdued"
|
||||
android:textSize="12sp" />
|
||||
|
||||
<!-- Per http://stackoverflow.com/questions/2359176/android-edittext-onclicklistener, not allowing focus allows us to highjack the click. -->
|
||||
|
||||
<EditText
|
||||
android:id="@+id/year_edit"
|
||||
style="@style/FxAccountEditItem"
|
||||
android:drawableRight="@drawable/fxaccount_ddarrow_inactive"
|
||||
android:focusable="false"
|
||||
android:hint="@string/fxaccount_create_account_year_of_birth"
|
||||
android:inputType="none" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/month_day_combo"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="1" >
|
||||
|
||||
<EditText
|
||||
android:id="@+id/month_edit"
|
||||
style="@style/FxAccountEditItem"
|
||||
android:layout_marginRight="10dp"
|
||||
android:drawableRight="@drawable/fxaccount_ddarrow_inactive"
|
||||
android:focusable="false"
|
||||
android:layout_weight="0.5"
|
||||
android:maxLength="3"
|
||||
android:hint="@string/fxaccount_create_account_month_of_birth"
|
||||
android:inputType="none" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/day_edit"
|
||||
style="@style/FxAccountEditItem"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:drawableRight="@drawable/fxaccount_ddarrow_inactive"
|
||||
android:focusable="false"
|
||||
android:layout_weight="0.5"
|
||||
android:hint="@string/fxaccount_create_account_day_of_birth"
|
||||
android:inputType="none" />
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
style="@style/FxAccountButtonLayout" >
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
style="@style/FxAccountProgress" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
style="@style/FxAccountProgressButton"
|
||||
android:text="@string/fxaccount_create_account_button" />
|
||||
</RelativeLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sign_in_instead_link"
|
||||
style="@style/FxAccountLinkItem"
|
||||
android:focusable="true"
|
||||
android:layout_marginBottom="0dp"
|
||||
android:text="@string/fxaccount_create_account_sign_in_instead" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/choose_what_to_sync_checkbox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:text="@string/fxaccount_create_account_choose_what_to_sync" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/policy"
|
||||
style="@style/FxAccountPolicyItem"
|
||||
android:text="@string/fxaccount_create_account_policy_text" />
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<ImageView
|
||||
style="@style/FxAccountIcon"
|
||||
android:contentDescription="@string/fxaccount_empty_contentDescription" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/create_account_not_allowed_view"
|
||||
style="@style/FxAccountMiddle" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
android:text="@string/fxaccount_account_create_not_allowed" >
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountTextItem"
|
||||
android:layout_marginBottom="45dp"
|
||||
android:layout_marginTop="45dp"
|
||||
android:text="@string/fxaccount_account_create_not_allowed_you_must_meet_certain_age_requirements" >
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
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" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
<?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" >
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/account_server_layout"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:background="@color/fxaccount_error_preference_backgroundcolor"
|
||||
android:gravity="center_vertical"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight" >
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/fxaccount_empty_contentDescription"
|
||||
android:gravity="center"
|
||||
android:minWidth="48dip"
|
||||
android:padding="10dip"
|
||||
android:src="@drawable/fxaccount_sync_error" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="6dip"
|
||||
android:paddingRight="10dip"
|
||||
android:paddingTop="6dip" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/account_server_title"
|
||||
style="@style/FxAccountTextItem"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginBottom="0dp"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/fxaccount_custom_server_account_title" >
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/account_server_summary"
|
||||
style="@style/FxAccountTextItem"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="0dp"
|
||||
android:ellipsize="middle"
|
||||
android:focusable="true"
|
||||
android:focusableInTouchMode="true"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textSize="12sp" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/sync_server_layout"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:background="@color/fxaccount_error_preference_backgroundcolor"
|
||||
android:gravity="center_vertical"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight" >
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/fxaccount_empty_contentDescription"
|
||||
android:gravity="center"
|
||||
android:minWidth="48dip"
|
||||
android:padding="10dip"
|
||||
android:src="@drawable/fxaccount_sync_error" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="6dip"
|
||||
android:paddingRight="10dip"
|
||||
android:paddingTop="6dip" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sync_server_title"
|
||||
style="@style/FxAccountTextItem"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginBottom="0dp"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/fxaccount_custom_server_sync_title" >
|
||||
</TextView>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sync_server_summary"
|
||||
style="@style/FxAccountTextItem"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="0dp"
|
||||
android:ellipsize="marquee"
|
||||
android:focusable="true"
|
||||
android:focusableInTouchMode="true"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textSize="12sp" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</merge>
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
<?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" >
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/email_password_view"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<AutoCompleteTextView
|
||||
android:id="@+id/email"
|
||||
style="@style/FxAccountEditItem"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:completionThreshold="2"
|
||||
android:ems="10"
|
||||
android:hint="@string/fxaccount_email_hint"
|
||||
android:inputType="textEmailAddress" >
|
||||
|
||||
<requestFocus />
|
||||
</AutoCompleteTextView>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<EditText
|
||||
android:id="@+id/password"
|
||||
style="@style/FxAccountEditItem"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginBottom="0dp"
|
||||
android:background="@drawable/fxaccount_password_background"
|
||||
android:ems="10"
|
||||
android:hint="@string/fxaccount_password_hint"
|
||||
android:inputType="textPassword" />
|
||||
|
||||
<!-- For the following, I beg forgiveness. The show/hide button is a
|
||||
toggle button; its text depends on its state. The text for each
|
||||
state could be a different length. We want to maintain the
|
||||
button's width regardless of its state. To achieve this, we
|
||||
size the actual button to its container, and include two
|
||||
invisible (but present for layout purposes) buttons, one of
|
||||
each state. The container wraps the larger of the two dummy
|
||||
buttons; the actual button sizes to the container; and we're
|
||||
happy. Be thankful there are not three buttons! -->
|
||||
<FrameLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="0"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<Button
|
||||
android:id="@+id/show_password"
|
||||
style="@style/FxAccountShowHidePasswordButton"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:text="@string/fxaccount_password_show" >
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
style="@style/FxAccountShowHidePasswordButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
android:text="@string/fxaccount_password_show"
|
||||
android:visibility="invisible" >
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
style="@style/FxAccountShowHidePasswordButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
android:text="@string/fxaccount_password_hide"
|
||||
android:visibility="invisible" >
|
||||
</Button>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</merge>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/update_credentials_view"
|
||||
style="@style/FxAccountMiddle" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
android:text="@string/fxaccount_finish_migrating_header" />
|
||||
|
||||
<include layout="@layout/fxaccount_custom_server_view" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/remote_error"
|
||||
style="@style/FxAccountErrorItem" />
|
||||
|
||||
<include layout="@layout/fxaccount_email_password_view" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountTextItem"
|
||||
android:text="@string/fxaccount_finish_migrating_description" />
|
||||
|
||||
<RelativeLayout style="@style/FxAccountButtonLayout" >
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
style="@style/FxAccountProgress" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
style="@style/FxAccountProgressButton"
|
||||
android:text="@string/fxaccount_finish_migrating_button_label" />
|
||||
</RelativeLayout>
|
||||
|
||||
<TextView
|
||||
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" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<!-- In order to animate the icon from the bottom of the screen,
|
||||
the icon needs to pass over the padding. -->
|
||||
<LinearLayout
|
||||
android:id="@+id/intro_view"
|
||||
android:clipToPadding="false"
|
||||
style="@style/FxAccountMiddle" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
android:text="@string/fxaccount_getting_started_welcome_to_sync" >
|
||||
</TextView>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:contentDescription="@string/fxaccount_empty_contentDescription"
|
||||
android:src="@drawable/fxaccount_intro" >
|
||||
</ImageView>
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountTextItem"
|
||||
android:text="@string/fxaccount_getting_started_description" >
|
||||
</TextView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/get_started_button"
|
||||
style="@style/FxAccountButton"
|
||||
android:text="@string/fxaccount_getting_started_get_started" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/old_firefox"
|
||||
style="@style/FxAccountLinkifiedItem"
|
||||
android:text="@string/fxaccount_getting_started_old_firefox" />
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/icon"
|
||||
style="@style/FxAccountIcon"
|
||||
android:contentDescription="@string/fxaccount_empty_contentDescription" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountMiddle" >
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
android:text="@string/fxaccount_migration_finished_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:src="@drawable/fxaccount_checkbox" >
|
||||
</ImageView>
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountTextItem"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:text="@string/fxaccount_migration_finished_description"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<Button
|
||||
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" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/sign_in_view"
|
||||
style="@style/FxAccountMiddle" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
android:text="@string/fxaccount_sign_in_sub_header" />
|
||||
|
||||
<include layout="@layout/fxaccount_custom_server_view" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/remote_error"
|
||||
style="@style/FxAccountErrorItem" />
|
||||
|
||||
<include layout="@layout/fxaccount_email_password_view" />
|
||||
|
||||
<RelativeLayout style="@style/FxAccountButtonLayout"
|
||||
android:layout_marginTop="10dp" >
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
style="@style/FxAccountProgress" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
style="@style/FxAccountProgressButton"
|
||||
android:text="@string/fxaccount_sign_in_button_label" />
|
||||
</RelativeLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/forgot_password_link"
|
||||
style="@style/FxAccountLinkifiedItem"
|
||||
android:layout_gravity="left"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="@string/fxaccount_sign_in_forgot_password" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/create_account_link"
|
||||
style="@style/FxAccountLinkItem"
|
||||
android:layout_gravity="right"
|
||||
android:layout_weight="1"
|
||||
android:gravity="right"
|
||||
android:text="@string/fxaccount_sign_in_create_account_instead" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/policy"
|
||||
style="@style/FxAccountPolicyItem"
|
||||
android:text="@string/fxaccount_create_account_policy_text" />
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<ImageView
|
||||
style="@style/FxAccountIcon"
|
||||
android:contentDescription="@string/fxaccount_empty_contentDescription" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fillViewport="true" >
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/update_credentials_view"
|
||||
style="@style/FxAccountMiddle" >
|
||||
|
||||
<LinearLayout style="@style/FxAccountSpacer" />
|
||||
|
||||
<TextView
|
||||
style="@style/FxAccountHeaderItem"
|
||||
android:text="@string/fxaccount_update_credentials_header" />
|
||||
|
||||
<include layout="@layout/fxaccount_custom_server_view" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/remote_error"
|
||||
style="@style/FxAccountErrorItem" />
|
||||
|
||||
<include layout="@layout/fxaccount_email_password_view" />
|
||||
|
||||
<RelativeLayout style="@style/FxAccountButtonLayout" >
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progress"
|
||||
style="@style/FxAccountProgress" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
style="@style/FxAccountProgressButton"
|
||||
android:text="@string/fxaccount_update_credentials_button_label" />
|
||||
</RelativeLayout>
|
||||
|
||||
<TextView
|
||||
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" />
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
<?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/.
|
||||
-->
|
||||
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<style name="FxAccountMiddle">
|
||||
<item name="android:orientation">vertical</item>
|
||||
<item name="android:layout_width">500dp</item>
|
||||
<item name="android:minWidth">500dp</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<!-- layout_gravity controls where the middle container goes
|
||||
in its parent, and gravity controls where the container
|
||||
places its internal content. Usually, the middle
|
||||
container is a LinearLayout and the container is a
|
||||
ScrollView. In this case, layout_gravity="center"
|
||||
interacts badly with vertical scrolling. What is needed
|
||||
is layout_gravity="center_horizontal" and
|
||||
gravity="center". -->
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:layout_gravity">center_horizontal</item>
|
||||
<item name="android:paddingTop">25dp</item>
|
||||
<item name="android:paddingLeft">12dp</item>
|
||||
<item name="android:paddingRight">12dp</item>
|
||||
<item name="android:paddingBottom">15dp</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
@ -5,31 +5,5 @@
|
|||
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<color name="fxaccount_textColor">#424f59</color>
|
||||
<color name="fxaccount_textColorSubdued">#8a9ba8</color>
|
||||
|
||||
<color name="fxaccount_linkified_textColor">#8a9ba8</color>
|
||||
<color name="fxaccount_linkified_textColorLink">#0095dd</color>
|
||||
<color name="fxaccount_linkified_textColorLinkSubdued">#8a9ba8</color>
|
||||
|
||||
<color name="fxaccount_error">#d63920</color>
|
||||
|
||||
<color name="fxaccount_error_preference_backgroundcolor">#fad4d2</color>
|
||||
|
||||
<color name="fxaccount_button_textColor">#ffffff</color>
|
||||
<color name="fxaccount_button_background_active">#0095dd</color>
|
||||
<color name="fxaccount_button_background_hit">#0088cc</color>
|
||||
<color name="fxaccount_button_background_inactive">#8a9ba8</color>
|
||||
<color name="fxaccount_input_textColor">#424f59</color>
|
||||
<color name="fxaccount_input_textColor_pressed">#424f59</color>
|
||||
<color name="fxaccount_input_textColor_inactive">#8a9ba8</color>
|
||||
<color name="fxaccount_input_textColorHint">#8a9ba8</color>
|
||||
<color name="fxaccount_link_textColor">#0095dd</color>
|
||||
<color name="fxaccount_link_textColor_pressed">#0088cc</color>
|
||||
<color name="fxaccount_link_textColor_inactive">#8a9ba8</color>
|
||||
<color name="fxaccount_input_borderActive">#0095dd</color>
|
||||
<color name="fxaccount_input_borderInactive">#8a9ba8</color>
|
||||
<color name="fxaccount_password_show_textcolor">#8a9ba8</color>
|
||||
<color name="fxaccount_password_show_backgroundcolor">#ffffff</color>
|
||||
<color name="fxaccount_password_hide_textcolor">#ffffff</color>
|
||||
<color name="fxaccount_password_hide_backgroundcolor">#8a9ba8</color>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -4,21 +4,6 @@
|
|||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<resources>
|
||||
<dimen name="fxaccount_stroke_width">1dp</dimen>
|
||||
<dimen name="fxaccount_corner_radius">3dp</dimen>
|
||||
|
||||
<!-- The amount of horizontal padding that appears inside the email,
|
||||
password, etc input fields. -->
|
||||
<dimen name="fxaccount_input_padding_horizontal">10dp</dimen>
|
||||
<!-- And the amount of vertical padding that appears inside input
|
||||
fields. -->
|
||||
<dimen name="fxaccount_input_padding_vertical">10dp</dimen>
|
||||
|
||||
<!-- The amount of horizontal padding that appears around the show/hide
|
||||
password button. Vertical padding is provided by the adjacent input
|
||||
field. -->
|
||||
<dimen name="fxaccount_show_password_padding_horizontal">8dp</dimen>
|
||||
|
||||
<!-- Preference fragment padding, bottom -->
|
||||
<dimen name="preference_fragment_padding_bottom">0dp</dimen>
|
||||
<!-- Preference fragment padding, sides -->
|
||||
|
|
|
|||
|
|
@ -13,32 +13,6 @@
|
|||
<item name="android:windowNoTitle">false</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountMiddle">
|
||||
<item name="android:background">@android:color/white</item>
|
||||
<item name="android:orientation">vertical</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
<item name="android:paddingTop">10dp</item>
|
||||
<item name="android:paddingLeft">20dp</item>
|
||||
<item name="android:paddingRight">20dp</item>
|
||||
<item name="android:paddingBottom">10dp</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountSpacer">
|
||||
<item name="android:orientation">vertical</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">0dp</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountHeaderItem" parent="@style/FxAccountTextItem">
|
||||
<item name="android:textSize">24sp</item>
|
||||
<item name="android:layout_marginBottom">20dp</item>
|
||||
<item name="android:layout_marginLeft">0dp</item>
|
||||
<item name="android:layout_marginRight">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountTextItem" parent="@android:style/TextAppearance.Medium">
|
||||
<item name="android:textColor">@color/fxaccount_textColor</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
|
|
@ -50,113 +24,4 @@
|
|||
<item name="android:layout_marginRight">10dp</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountLinkItem" parent="@style/FxAccountTextItem">
|
||||
<item name="android:clickable">true</item>
|
||||
<item name="android:focusable">false</item>
|
||||
<item name="android:textColor">@drawable/fxaccount_linkitem_textcolor</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountButton" parent="@android:style/Widget.Button">
|
||||
<item name="android:background">@drawable/fxaccount_button_background</item>
|
||||
<item name="android:textColor">@drawable/fxaccount_button_color</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
<item name="android:paddingTop">10dp</item>
|
||||
<item name="android:paddingLeft">20dp</item>
|
||||
<item name="android:paddingRight">20dp</item>
|
||||
<item name="android:paddingBottom">10dp</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginBottom">10dp</item>
|
||||
</style>
|
||||
|
||||
<!-- Use this in a FxAccountButtonLayout. -->
|
||||
<style name="FxAccountProgressButton" parent="@style/FxAccountButton">
|
||||
<item name="android:layout_marginBottom">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountEditItem" parent="@android:style/Widget.EditText">
|
||||
<item name="android:textSize">18sp</item>
|
||||
<item name="android:paddingLeft">@dimen/fxaccount_input_padding_horizontal</item>
|
||||
<item name="android:paddingRight">@dimen/fxaccount_input_padding_horizontal</item>
|
||||
<item name="android:paddingTop">@dimen/fxaccount_input_padding_vertical</item>
|
||||
<item name="android:paddingBottom">@dimen/fxaccount_input_padding_vertical</item>
|
||||
<item name="android:background">@drawable/fxaccount_textfield_background</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginBottom">10dp</item>
|
||||
<item name="android:singleLine">true</item>
|
||||
<item name="android:textColor">@color/fxaccount_input_textColor</item>
|
||||
<item name="android:textColorHint">@color/fxaccount_input_textColorHint</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountLinkifiedItem" parent="@style/FxAccountTextItem">
|
||||
<item name="android:clickable">true</item>
|
||||
<item name="android:focusable">true</item>
|
||||
<item name="android:textColor">@color/fxaccount_linkified_textColor</item>
|
||||
<item name="android:textColorLink">@color/fxaccount_linkified_textColorLink</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:gravity">center</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountPolicyItem" parent="@style/FxAccountLinkifiedItem">
|
||||
<item name="android:layout_marginBottom">20dp</item>
|
||||
<item name="android:textColorLink">@color/fxaccount_linkified_textColorLinkSubdued</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountIcon">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_gravity">center_horizontal</item>
|
||||
<item name="android:src">@drawable/icon</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountErrorItem">
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_marginBottom">10dp</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:gravity">center_horizontal</item>
|
||||
<item name="android:background">@drawable/fxaccount_textview_error_background</item>
|
||||
<item name="android:padding">5dp</item>
|
||||
<item name="android:text">Error</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
<item name="android:textColorLink">@android:color/white</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:visibility">invisible</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountProgress" parent="@android:style/Widget.ProgressBar.Small">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_centerInParent">true</item>
|
||||
<item name="android:visibility">invisible</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountButtonLayout">
|
||||
<item name="android:orientation">vertical</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:background">@drawable/fxaccount_button_background</item>
|
||||
<item name="android:layout_marginTop">10dp</item>
|
||||
<item name="android:layout_marginBottom">10dp</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountCheckBox">
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginBottom">10dp</item>
|
||||
<item name="android:textColor">@drawable/fxaccount_checkbox_textcolor</item>
|
||||
</style>
|
||||
|
||||
<style name="FxAccountShowHidePasswordButton" parent="@android:style/Widget.Button">
|
||||
<item name="android:background">@drawable/fxaccount_password_button_show_background</item>
|
||||
<item name="android:minHeight">0dp</item>
|
||||
<item name="android:minWidth">0dp</item>
|
||||
<item name="android:paddingLeft">@dimen/fxaccount_show_password_padding_horizontal</item>
|
||||
<item name="android:paddingRight">@dimen/fxaccount_show_password_padding_horizontal</item>
|
||||
<item name="android:textColor">@color/fxaccount_input_textColor</item>
|
||||
<item name="android:textSize">16sp</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче