Merge branch 'trz/rebase' into trz/rename

1 files changed, 43 insertions, 0 deletions

diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
new file mode 100644
index 00000000..f75f2674
--- /dev/null
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="8dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="16dp">
+
+    <TextView
+        android:id="@+id/your_account"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/your_account"
+        android:textColor="@color/primaryText"
+        android:textSize="?attr/TextSizeBody"/>
+
+    <Spinner
+        android:id="@+id/account"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/jabber_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/account_settings_jabber_id"
+        android:textColor="@color/primaryText"
+        android:textSize="?attr/TextSizeBody"/>
+
+    <AutoCompleteTextView
+        android:id="@+id/jid"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/account_settings_example_jabber_id"
+        android:inputType="textEmailAddress"
+        android:textColor="@color/primaryText"
+        android:textColorHint="@color/secondaryText"
+        android:textSize="?attr/TextSizeBody" />
+
+</LinearLayout>
\ No newline at end of file