diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-29 13:53:18 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-29 13:53:18 +0200 |
commit | 377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6 (patch) | |
tree | c90c5941126937485b31f617dd1c31acd23fabae /OpenKeychain/src/main/res/layout/key_list_activity.xml | |
parent | da131220aac727865b9e33e8d34743939e8acbf0 (diff) | |
parent | f4ee71e3ef0dcacf691def97a94880b277a99496 (diff) | |
download | open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.tar.gz open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.tar.bz2 open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.zip |
Merge branch 'ditch-appmsg'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/key_list_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_activity.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml index c4c2c35cb..6c9bed872 100644 --- a/OpenKeychain/src/main/res/layout/key_list_activity.xml +++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml @@ -2,10 +2,19 @@ <android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> - <include layout="@layout/key_list_content"/> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <include layout="@layout/drawer_list" /> + <include layout="@layout/notify_area"/> + + <include layout="@layout/key_list_content"/> + + <include layout="@layout/drawer_list" /> + + </LinearLayout> </android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file |