Sat, 14 Feb 2015 01:57:28 +0100
Manually merge changeset e1ea0f6a5a50, explicitly specifying app name.
1 <merge xmlns:android="http://schemas.android.com/apk/res/android"
2 xmlns:tools="http://schemas.android.com/tools"
3 tools:context=".AuthenticatorActivity" >
5 <!-- Login progress -->
7 <LinearLayout
8 android:id="@+id/login_status"
9 android:layout_width="wrap_content"
10 android:layout_height="wrap_content"
11 android:layout_gravity="center"
12 android:gravity="center_horizontal"
13 android:orientation="vertical"
14 android:visibility="gone" >
16 <ProgressBar
17 style="?android:attr/progressBarStyleLarge"
18 android:layout_width="wrap_content"
19 android:layout_height="wrap_content"
20 android:layout_marginBottom="8dp" />
22 <TextView
23 android:id="@+id/login_status_message"
24 android:layout_width="wrap_content"
25 android:layout_height="wrap_content"
26 android:layout_marginBottom="16dp"
27 android:fontFamily="sans-serif-light"
28 android:text="@string/login_progress_signing_in"
29 android:textAppearance="?android:attr/textAppearanceMedium" />
30 </LinearLayout>
32 <!-- Login form -->
34 <ScrollView
35 android:id="@+id/login_form"
36 android:layout_width="match_parent"
37 android:layout_height="match_parent" >
39 <LinearLayout
40 style="@style/LoginFormContainer"
41 android:orientation="vertical" >
43 <EditText
44 android:id="@+id/user"
45 android:layout_width="match_parent"
46 android:layout_height="wrap_content"
47 android:hint="@string/prompt_user"
48 android:maxLines="1"
49 android:singleLine="true"
50 android:inputType="text|textEmailAddress"
51 />
53 <EditText
54 android:id="@+id/password"
55 android:layout_width="match_parent"
56 android:layout_height="wrap_content"
57 android:hint="@string/prompt_password"
58 android:imeActionId="@+id/login"
59 android:imeActionLabel="@string/action_sign_in_short"
60 android:imeOptions="actionUnspecified"
61 android:inputType="textPassword"
62 android:maxLines="1"
63 android:singleLine="true" />
66 <CheckBox
67 android:layout_width="wrap_content"
68 android:layout_height="wrap_content"
69 android:text="Display Password"
70 android:id="@+id/showPassword"
71 android:checked="false" />
73 <EditText
74 android:id="@+id/url"
75 android:layout_width="match_parent"
76 android:layout_height="wrap_content"
77 android:ems="10"
78 android:hint="@string/prompt_url"
79 android:inputType="textUri" >
81 <requestFocus />
82 </EditText>
84 <CheckBox
85 android:id="@+id/trustall"
86 android:layout_width="wrap_content"
87 android:layout_height="wrap_content"
88 android:checked="true"
89 android:text="@string/trustall"
90 android:visibility="gone" />
92 <EditText
93 android:id="@+id/accountname"
94 android:layout_width="match_parent"
95 android:layout_height="wrap_content"
96 android:hint="@string/prompt_accountname"
97 android:inputType="text"
98 android:maxLines="1"
99 android:singleLine="true" />
101 <Button
102 android:id="@+id/sign_in_button"
103 android:layout_width="wrap_content"
104 android:layout_height="wrap_content"
105 android:layout_gravity="right"
106 android:layout_marginTop="16dp"
107 android:paddingLeft="32dp"
108 android:paddingRight="32dp"
109 android:text="@string/action_sign_in_register" />
111 <TextView
112 android:id="@+id/sign_in_note_accountname"
113 android:layout_width="wrap_content"
114 android:layout_height="wrap_content"
115 android:text="@string/action_sign_in_note_accountname" />
117 </LinearLayout>
118 </ScrollView>
120 </merge>