diff options
| author | Ashley Hughes <spirit.returned@gmail.com> | 2014-03-07 15:16:13 +0000 |
|---|---|---|
| committer | Ashley Hughes <spirit.returned@gmail.com> | 2014-03-07 15:16:13 +0000 |
| commit | fba0e2af1d04fe95f82a60ed2acbb69d5be920d2 (patch) | |
| tree | 2ec7978ddac4a3c3a2b99e165ddfdffea3835989 /OpenPGP-Keychain/src/main/res/layout | |
| parent | 04fa0e9cc7fbfc117948d60a3ad8bfab0b0060ba (diff) | |
| parent | 59067f9f8b0a12f875ba928b30f8f35fc284356c (diff) | |
| download | open-keychain-fba0e2af1d04fe95f82a60ed2acbb69d5be920d2.tar.gz open-keychain-fba0e2af1d04fe95f82a60ed2acbb69d5be920d2.tar.bz2 open-keychain-fba0e2af1d04fe95f82a60ed2acbb69d5be920d2.zip | |
keep up with master
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout')
6 files changed, 19 insertions, 11 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml index c60416494..aa9d59004 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml @@ -6,7 +6,7 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:padding="16dp" android:orientation="vertical"> @@ -26,4 +26,4 @@ tools:layout="@layout/api_app_settings_fragment" /> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml index d4fb5103a..d83c8e87d 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml @@ -6,7 +6,7 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:padding="16dp" android:orientation="vertical"> @@ -18,4 +18,4 @@ tools:layout="@layout/api_app_settings_fragment" /> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml index 182540dc5..fc4422cf0 100644 --- a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml @@ -27,7 +27,7 @@ android:text="@string/label_no_passphrase" /> <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/edit_key_btn_change_pass_phrase" + android:id="@+id/edit_key_btn_change_passphrase" android:layout_width="match_parent" android:layout_height="60dp" android:padding="4dp" diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml index 678f2bd4e..27e29eddb 100644 --- a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml @@ -135,7 +135,7 @@ <TableRow> <TextView - android:id="@+id/label_passPhrase" + android:id="@+id/label_passphrase" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" @@ -144,7 +144,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText - android:id="@+id/passPhrase" + android:id="@+id/passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" /> @@ -153,7 +153,7 @@ <TableRow> <TextView - android:id="@+id/label_passPhraseAgain" + android:id="@+id/label_passphraseAgain" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" @@ -162,7 +162,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText - android:id="@+id/passPhraseAgain" + android:id="@+id/passphraseAgain" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml index 8b99e5d2f..4a09e4240 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml @@ -71,8 +71,8 @@ <LinearLayout android:id="@+id/editors" android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:orientation="vertical" /> </ScrollView> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml index a18ce46fc..5337433c6 100644 --- a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml @@ -4,8 +4,16 @@ android:layout_height="match_parent" android:layout_centerHorizontal="true" > + <EditText + android:id="@+id/select_public_key_search" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/menu_search" + android:drawableLeft="@drawable/ic_action_search"/> + <FrameLayout android:id="@+id/select_public_key_fragment_container" + android:layout_below="@id/select_public_key_search" android:layout_width="match_parent" android:layout_height="match_parent" /> |