diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-09 16:26:38 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-09 16:26:38 +0200 |
commit | 73ccff9537f8be9341f284ca3241f14f529ab067 (patch) | |
tree | d3bf64424b54d394da45f9b01d2c1165d9850e3b /OpenKeychain/src/main/res | |
parent | 340ed7c08dc59ac4a90069112aa599c36f94d4b9 (diff) | |
parent | 134e1cb764656051c73bf332eabc3cdc9cedc87d (diff) | |
download | open-keychain-73ccff9537f8be9341f284ca3241f14f529ab067.tar.gz open-keychain-73ccff9537f8be9341f284ca3241f14f529ab067.tar.bz2 open-keychain-73ccff9537f8be9341f284ca3241f14f529ab067.zip |
Merge remote-tracking branch 'origin/development' into development
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/api_remote_create_account.xml | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml index 3aee9094f..a6a39b1ad 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml @@ -1,29 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="match_parent" + android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="16dp" - android:orientation="vertical"> + <include layout="@layout/notify_area" /> - <TextView - android:id="@+id/api_remote_create_account_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="3dip" - android:text="@string/api_create_account_text" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <ScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <fragment - android:id="@+id/api_account_settings_fragment" - android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - tools:layout="@layout/api_app_settings_fragment" /> + android:padding="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/api_remote_create_account_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="3dip" + android:text="@string/api_create_account_text" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <fragment + android:id="@+id/api_account_settings_fragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/api_app_settings_fragment" /> - </LinearLayout> -</ScrollView> + </LinearLayout> + </ScrollView> +</LinearLayout>
\ No newline at end of file |