diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-23 00:28:26 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-23 00:28:26 +0100 |
commit | 7bddd5be1d76360f1112e780091ee6636591caae (patch) | |
tree | b378b0df33576180e56cf29d7a880ccfa20fbf0c /OpenKeychain/src/main/res | |
parent | 6b57afc350996484256d85b862c284788b9f3f70 (diff) | |
download | open-keychain-7bddd5be1d76360f1112e780091ee6636591caae.tar.gz open-keychain-7bddd5be1d76360f1112e780091ee6636591caae.tar.bz2 open-keychain-7bddd5be1d76360f1112e780091ee6636591caae.zip |
Remove old pattern lib, add new pattern lib
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml | 15 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml | 64 |
2 files changed, 36 insertions, 43 deletions
diff --git a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml b/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml deleted file mode 100644 index 6a154fa55..000000000 --- a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/topLayout" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <com.haibison.android.lockpattern.widget.LockPatternView_v14 - android:id="@+id/lockPattern" - android:layout_width="@dimen/alp_42447968_separator_size" - android:layout_height="@dimen/alp_42447968_separator_size" - android:layout_marginTop="@dimen/alp_42447968_separator_size" - android:layout_marginBottom="@dimen/alp_42447968_separator_size" - android:layout_gravity="center_horizontal" /> -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml index 61bd4572d..de957cc74 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml @@ -7,13 +7,12 @@ tools:context="pSontag.testopenkeychain.Passphrase"> - <TableLayout android:layout_width="match_parent" android:layout_height="wrap_content"> - <TableRow - android:layout_marginBottom="10dp"> + <TableRow android:layout_marginBottom="10dp"> + <TextView android:id="@+id/passphraseText" android:layout_width="match_parent" @@ -23,7 +22,7 @@ android:layout_gravity="center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/passphrase" - android:layout_weight="1"/> + android:layout_weight="1" /> </TableRow> <View @@ -32,26 +31,29 @@ android:background="?android:attr/listDivider" /> <TableRow> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/passphrase"/> + android:text="@string/passphrase" /> + <EditText android:id="@+id/passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" android:padding="8dp" - android:layout_weight="6"/> + android:layout_weight="6" /> </TableRow> <TableRow android:layout_marginTop="10dp" android:layout_marginBottom="10dp"> + <TextView android:id="@+id/passphraseTextAgain" android:layout_width="wrap_content" @@ -59,7 +61,8 @@ android:padding="8dp" android:text="@string/passphrase_again" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_weight="1"/> + android:layout_weight="1" /> + <EditText android:id="@+id/passphraseAgain" android:layout_width="match_parent" @@ -67,10 +70,11 @@ android:inputType="textPassword" android:imeOptions="actionDone" android:padding="8dp" - android:layout_weight="6"/> + android:layout_weight="6" /> </TableRow> </TableLayout> + <View android:layout_width="match_parent" android:layout_height="1dip" @@ -80,28 +84,32 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Cancel" - android:onClick="cancel" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - style="?attr/alp_42447968_button_bar_button_style"/> - <View - android:layout_width="1dip" - android:layout_height="50dip" - android:background="?android:attr/listDivider" /> - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Ok" - android:onClick="savePassphrase" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - style="?attr/alp_42447968_button_bar_button_style"/> + + <!--<Button--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:text="Cancel"--> + <!--android:onClick="cancel"--> + <!--android:layout_weight="1"--> + <!--android:textAppearance="?android:attr/textAppearanceMedium"--> + <!--style="?attr/alp_42447968_button_bar_button_style" />--> + + <!--<View--> + <!--android:layout_width="1dip"--> + <!--android:layout_height="50dip"--> + <!--android:background="?android:attr/listDivider" />--> + + <!--<Button--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:text="Ok"--> + <!--android:onClick="savePassphrase"--> + <!--android:layout_weight="1"--> + <!--android:textAppearance="?android:attr/textAppearanceMedium"--> + <!--style="?attr/alp_42447968_button_bar_button_style" />--> </LinearLayout> + <View android:layout_width="match_parent" android:layout_height="1dip" |