diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-03 15:46:04 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-03 15:46:04 +0100 |
| commit | b837579cdcb88c5c71708d66b78c9e21cf33a4e8 (patch) | |
| tree | fda8801aa7f1f6e19e6dbfb3a0965da3b39a61ee /OpenPGP-Keychain/src/main/res | |
| parent | 94e161fe0d08149d26b0d5dcd41bb883d1162ff4 (diff) | |
| parent | 3acbefa98b0a7e64608de743afebef5a863d98b1 (diff) | |
| download | open-keychain-b837579cdcb88c5c71708d66b78c9e21cf33a4e8.tar.gz open-keychain-b837579cdcb88c5c71708d66b78c9e21cf33a4e8.tar.bz2 open-keychain-b837579cdcb88c5c71708d66b78c9e21cf33a4e8.zip | |
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
3 files changed, 6 insertions, 6 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/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> |