diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-28 00:39:18 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-28 00:39:18 +0100 |
| commit | fd55cdb08e47b87d2fdc98d15fc679725e2d2619 (patch) | |
| tree | 015276c8b732179deda7aa1a5b6f3719671787bd /OpenKeychain/src/main/res/layout/key_list_fragment.xml | |
| parent | 453b67f7a8cb274d794843e54d6d050a7ef7a98a (diff) | |
| parent | 9c62c3fd3985958a43707c7a25f07744a6cfcb95 (diff) | |
| download | open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.tar.gz open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.tar.bz2 open-keychain-fd55cdb08e47b87d2fdc98d15fc679725e2d2619.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/key_list_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_fragment.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index f31d5fce6..65935f9c8 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -2,7 +2,8 @@ <RelativeLayout xmlns:fab="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" - android:layout_width="match_parent"> + android:layout_width="match_parent" + > <!--rebuild functionality of ListFragment --> <FrameLayout @@ -52,7 +53,8 @@ fab:fab_labelStyle="@style/FabMenuStyle" android:layout_marginBottom="8dp" android:layout_marginRight="16dp" - android:layout_marginEnd="16dp"> + android:layout_marginEnd="16dp" + > <com.getbase.floatingactionbutton.FloatingActionButton android:id="@+id/fab_add_qr_code" |