diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 14:39:35 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 14:39:35 +0200 |
| commit | 85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1 (patch) | |
| tree | 4a20a9065d9411d35b720a0fd446ab4e2ff89b9f /OpenKeychain/src/main/res/layout/import_keys_activity.xml | |
| parent | 0687f7f40e1aecf4fbc109c3ab3fa2c3613546b3 (diff) | |
| parent | baa3c86e1246d486d80c963ddc6c64b58f2a5093 (diff) | |
| download | open-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.tar.gz open-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.tar.bz2 open-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.zip | |
Merge pull request #553 from Valodim/split-masterKeyId
Split master key & partial fix for uid order
Diffstat (limited to 'OpenKeychain/src/main/res/layout/import_keys_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_activity.xml | 53 |
1 files changed, 46 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index c82607a33..eb1333704 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -1,11 +1,50 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" > +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true"> - <include layout="@layout/import_keys_content"/> + <FrameLayout + android:id="@+id/import_navigation_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:orientation="vertical" + android:paddingLeft="4dp" + android:paddingRight="4dp" /> - <include layout="@layout/drawer_list" /> + <LinearLayout + android:id="@+id/import_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp"> -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/import_import" + android:layout_width="match_parent" + android:layout_height="50dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:text="@string/import_import" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info" /> + + </LinearLayout> + + <FrameLayout + android:id="@+id/import_keys_list_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/import_footer" + android:layout_alignParentLeft="true" + android:layout_below="@+id/import_navigation_fragment" + android:orientation="vertical" + android:paddingLeft="4dp" + android:paddingRight="4dp" /> +</RelativeLayout>
\ No newline at end of file |