diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-28 11:00:18 +0200 |
| commit | c0ebc926117d3e444c7c32bf3251880852000df6 (patch) | |
| tree | b84926b3eee5cf1cfd6d38a2c3bec23e8f0b6779 /OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml | |
| parent | ad69e47cec58287d82978b28416db50f6c3feb77 (diff) | |
| parent | b193965e585d0d492cf2744e3c86ecc9e45b71d4 (diff) | |
| download | open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.gz open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.tar.bz2 open-keychain-c0ebc926117d3e444c7c32bf3251880852000df6.zip | |
Merge branch 'master' into yubikey
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml index 88686bbbc..af06614b9 100644 --- a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml +++ b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml @@ -1,20 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" > - <android.support.v4.widget.FixedDrawerLayout - android:id="@+id/drawer_layout" - - android:layout_width="match_parent" - android:layout_height="match_parent"> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal"> + <android.support.v4.widget.FixedDrawerLayout + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <include layout="@layout/drawer_list"/> + <include layout="@layout/drawer_list" /> </android.support.v4.widget.FixedDrawerLayout> - <include layout="@layout/api_apps_list_content"/> + <include layout="@layout/api_apps_list_content" /> </FrameLayout>
\ No newline at end of file |