diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-31 23:19:01 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-31 23:19:01 +0200 |
| commit | eae7c711a3f588a24ef621a8b82bcd793bcb7e70 (patch) | |
| tree | 6c1017380b9234a193cfc6c6460ebfd44923837d /OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml | |
| parent | 0c7eea225b7c04549e92c8c7729bf0e7a04aa5c7 (diff) | |
| parent | 50aea621ba4de844cf6eee077d1f5b14d0247f14 (diff) | |
| download | open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.tar.gz open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.tar.bz2 open-keychain-eae7c711a3f588a24ef621a8b82bcd793bcb7e70.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml b/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml deleted file mode 100644 index 258ea7223..000000000 --- a/OpenKeychain/src/main/res/layout/wizard_create_key_fragment.xml +++ /dev/null @@ -1,41 +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="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingBottom="4dp" - android:text="Enter Full Name, Email and Passphrase!" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <AutoCompleteTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPersonName" - android:hint="Name" - android:ems="10" - android:id="@+id/name" /> - - <AutoCompleteTextView - android:id="@+id/email" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="bla@example.com" - android:layout_weight="1" - android:ems="10" - android:inputType="textEmailAddress" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" - android:hint="passphrase" - android:ems="10" - android:id="@+id/passphrase" - android:layout_gravity="center_horizontal" /> - - -</LinearLayout>
\ No newline at end of file |