diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
| commit | 34a7728cec5c17ef25f3d5cd56421e4f5258862d (patch) | |
| tree | f8fcf0aced9b106facff2e50405a19288931da6b /OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml | |
| parent | b73ad7d87e7ddef03c17b4983f526c0613403df6 (diff) | |
| parent | e049895b9f8f5f9996ac678acf6810768e859695 (diff) | |
| download | open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.gz open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.bz2 open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.zip | |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml index a581caa0e..e77e01bc7 100644 --- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml @@ -1,22 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" +<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" + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <include layout="@layout/notify_area" /> + <FrameLayout - android:id="@+id/view_key_advanced_fragment" + android:id="@+id/content_frame" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/view_key_advanced_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> - </FrameLayout> + </FrameLayout> -</LinearLayout>
\ No newline at end of file + </LinearLayout> +</RelativeLayout>
\ No newline at end of file |