cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of github.com:open-keychain/open-keychain into development

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
This commit is contained in:
Dominik Schürmann
2015-02-28 00:39:18 +01:00
parent 453b67f7a8 9c62c3fd39
commit fd55cdb08e
4 changed files with 89 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View File

@@ -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"