diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-21 23:06:25 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-21 23:06:51 +0200 |
commit | 952bb99a2467bb5c1c2988d33451df0249e04a42 (patch) | |
tree | 7c8cdeba0812cf84443880010cbedc73ab3a52d7 /OpenKeychain/src/main/res/layout/import_keys_activity.xml | |
parent | 6d7daec37f9ac7efbdd687c97ca45f9c9ddc5602 (diff) | |
parent | 8a2ffd8f90e9653ed69f945a94f6b9702dbdfff4 (diff) | |
download | open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.tar.gz open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.tar.bz2 open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.zip |
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/import_keys_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_activity.xml | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 876374700..2a332823e 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -1,20 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <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"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <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" /> + android:orientation="vertical" /> <LinearLayout android:id="@+id/import_footer" @@ -56,6 +52,7 @@ android:layout_alignParentLeft="true" android:layout_below="@+id/import_navigation_fragment" android:orientation="vertical" - android:paddingLeft="4dp" - android:paddingRight="4dp" /> + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" /> </RelativeLayout>
\ No newline at end of file |