Use Toolbar and new BaseActivity

This commit is contained in:
Dominik Schürmann
2015-01-13 23:15:13 +01:00
parent 862d1f1971
commit d8ff737fc5
43 changed files with 1199 additions and 887 deletions

View File

@@ -1,21 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/notify_area" />
<include
android:id="@+id/toolbar"
layout="@layout/toolbar" />
<FrameLayout
android:id="@+id/content_frame"
<LinearLayout
android:layout_below="@id/toolbar"
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment
android:id="@+id/multi_certify_key_fragment"
android:name="org.sufficientlysecure.keychain.ui.CertifyKeyFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<include layout="@layout/notify_area" />
</LinearLayout>
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment
android:id="@+id/multi_certify_key_fragment"
android:name="org.sufficientlysecure.keychain.ui.CertifyKeyFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
</LinearLayout>
</RelativeLayout>