Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | <?xml version="1.0" encoding="utf-8"?> |
michael@0 | 2 | <!-- |
michael@0 | 3 | This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 4 | - License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 5 | - file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 6 | --> |
michael@0 | 7 | |
michael@0 | 8 | <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
michael@0 | 9 | android:layout_width="fill_parent" |
michael@0 | 10 | android:layout_height="fill_parent" |
michael@0 | 11 | android:fillViewport="true" > |
michael@0 | 12 | |
michael@0 | 13 | <LinearLayout |
michael@0 | 14 | android:id="@+id/create_account_view" |
michael@0 | 15 | style="@style/FxAccountMiddle" > |
michael@0 | 16 | |
michael@0 | 17 | <LinearLayout style="@style/FxAccountSpacer" /> |
michael@0 | 18 | |
michael@0 | 19 | <TextView |
michael@0 | 20 | style="@style/FxAccountHeaderItem" |
michael@0 | 21 | android:text="@string/fxaccount_create_account_header" /> |
michael@0 | 22 | |
michael@0 | 23 | <include layout="@layout/fxaccount_email_password_view" /> |
michael@0 | 24 | |
michael@0 | 25 | <TextView |
michael@0 | 26 | style="@style/FxAccountTextItem" |
michael@0 | 27 | android:layout_marginTop="10dp" |
michael@0 | 28 | android:text="@string/fxaccount_create_account_password_length_restriction" |
michael@0 | 29 | android:textColor="@color/fxaccount_textColorSubdued" /> |
michael@0 | 30 | |
michael@0 | 31 | <!-- Per http://stackoverflow.com/questions/2359176/android-edittext-onclicklistener, not allowing focus allows us to highjack the click. --> |
michael@0 | 32 | |
michael@0 | 33 | <EditText |
michael@0 | 34 | android:id="@+id/year_edit" |
michael@0 | 35 | style="@style/FxAccountEditItem" |
michael@0 | 36 | android:drawableRight="@drawable/fxaccount_ddarrow_inactive" |
michael@0 | 37 | android:focusable="false" |
michael@0 | 38 | android:hint="@string/fxaccount_create_account_year_of_birth" |
michael@0 | 39 | android:inputType="none" /> |
michael@0 | 40 | |
michael@0 | 41 | <TextView |
michael@0 | 42 | android:id="@+id/policy" |
michael@0 | 43 | style="@style/FxAccountLinkifiedItem" |
michael@0 | 44 | android:layout_marginBottom="0dp" |
michael@0 | 45 | android:layout_marginTop="10dp" |
michael@0 | 46 | android:layout_marginLeft="10dp" |
michael@0 | 47 | android:layout_marginRight="10dp" |
michael@0 | 48 | android:text="@string/fxaccount_create_account_policy_text" |
michael@0 | 49 | android:textColorLink="@color/fxaccount_linkified_textColorLinkSubdued" /> |
michael@0 | 50 | |
michael@0 | 51 | <TextView |
michael@0 | 52 | android:id="@+id/remote_error" |
michael@0 | 53 | style="@style/FxAccountErrorItem" /> |
michael@0 | 54 | |
michael@0 | 55 | <RelativeLayout |
michael@0 | 56 | style="@style/FxAccountButtonLayout" |
michael@0 | 57 | android:layout_marginBottom="10dp" > |
michael@0 | 58 | |
michael@0 | 59 | <ProgressBar |
michael@0 | 60 | android:id="@+id/progress" |
michael@0 | 61 | style="@style/FxAccountProgress" /> |
michael@0 | 62 | |
michael@0 | 63 | <Button |
michael@0 | 64 | android:id="@+id/button" |
michael@0 | 65 | style="@style/FxAccountButton" |
michael@0 | 66 | android:text="@string/fxaccount_create_account_button" /> |
michael@0 | 67 | </RelativeLayout> |
michael@0 | 68 | |
michael@0 | 69 | <CheckBox |
michael@0 | 70 | android:id="@+id/choose_what_to_sync_checkbox" |
michael@0 | 71 | android:layout_width="wrap_content" |
michael@0 | 72 | android:layout_height="wrap_content" |
michael@0 | 73 | android:layout_gravity="center_horizontal" |
michael@0 | 74 | android:layout_margin="0dp" |
michael@0 | 75 | android:text="@string/fxaccount_create_account_choose_what_to_sync" /> |
michael@0 | 76 | |
michael@0 | 77 | <TextView |
michael@0 | 78 | android:id="@+id/sign_in_instead_link" |
michael@0 | 79 | style="@style/FxAccountLinkItem" |
michael@0 | 80 | android:layout_marginBottom="20dp" |
michael@0 | 81 | android:layout_marginTop="20dp" |
michael@0 | 82 | android:focusable="true" |
michael@0 | 83 | android:text="@string/fxaccount_create_account_sign_in_instead" /> |
michael@0 | 84 | |
michael@0 | 85 | <LinearLayout style="@style/FxAccountSpacer" /> |
michael@0 | 86 | |
michael@0 | 87 | <ImageView |
michael@0 | 88 | style="@style/FxAccountIcon" |
michael@0 | 89 | android:contentDescription="@string/fxaccount_empty_contentDescription" /> |
michael@0 | 90 | </LinearLayout> |
michael@0 | 91 | |
michael@0 | 92 | </ScrollView> |