Move key list logic into fragment, UI fixes for nav drawer

9 files changed, 0 insertions, 57 deletions

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..05be749c3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..f3743dc20
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..87095ef26
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..f32d7e708
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..a4286b54c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
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
deleted file mode 100644
index af06614b9..000000000
--- a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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">
-
-        <include layout="@layout/drawer_list" />
-
-    </android.support.v4.widget.FixedDrawerLayout>
-
-    <include layout="@layout/api_apps_list_content" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
deleted file mode 100644
index df187e0a5..000000000
--- a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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" >
-
-    <include layout="@layout/api_apps_list_content"/>
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
deleted file mode 100644
index e1922079c..000000000
--- a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
-
-    <FrameLayout
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <fragment
-            android:id="@+id/crypto_consumers_list_fragment"
-            android:name="org.sufficientlysecure.keychain.remote.ui.AppsListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/api_account_settings.xml b/OpenKeychain/src/main/res/menu/api_account_settings.xml
index d08fc7f42..713345ffc 100644
--- a/OpenKeychain/src/main/res/menu/api_account_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_account_settings.xml
@@ -6,9 +6,5 @@
         android:id="@+id/menu_account_settings_delete"
         android:title="@string/api_settings_delete_account"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/menu_account_settings_cancel"
-        android:title="@string/api_settings_cancel"
-        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file