diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
| commit | 409fdd8596f217e6f4101064342273268425edfb (patch) | |
| tree | f3a50eb54c0e88bce33e34347f6dfe325917e089 /res/layout | |
| parent | 449c2a544b48a2b9adf0df094eb1ac0d49531ebe (diff) | |
| parent | 5fe3f207d407543b13652c4a3c31bf8f9f9690a5 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/edit_account_dialog.xml | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml deleted file mode 100644 index 3b2ee981..00000000 --- a/res/layout/edit_account_dialog.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?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:padding="8dp"> - - <TextView - android:id="@+id/textView2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="14sp" - android:text="@string/account_settings_jabber_id" /> - - - - <AutoCompleteTextView - android:id="@+id/account_jid" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:inputType="textEmailAddress" - android:hint="@string/account_settings_example_jabber_id" /> - - - - <TextView - android:paddingTop="8dp" - android:id="@+id/textView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/account_settings_password" - android:textSize="14sp"/> - - <EditText - android:id="@+id/account_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:inputType="textPassword" - android:hint="@string/password" - android:fontFamily="sans-serif" /> - - <CheckBox - android:id="@+id/edit_account_register_new" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/register_account"/> - - - <TextView - android:paddingTop="8dp" - android:id="@+id/account_confirm_password_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/account_settings_confirm_password" - android:textSize="14sp" - android:visibility="gone"/> - - <EditText - android:id="@+id/account_password_confirm2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:inputType="textPassword" - android:hint="@string/confirm_password" - android:visibility="gone" - android:fontFamily="sans-serif" /> - -</LinearLayout> |