From e4e2d647c8cd8bf2d1e318c85d41173caf18adf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 26 Jan 2015 00:50:35 +0100
Subject: Material Design: Full screen dialogs

---
 .../main/res/drawable-hdpi/ic_action_collapse.png  | Bin 467 -> 0 bytes
 .../main/res/drawable-hdpi/ic_action_expand.png    | Bin 415 -> 0 bytes
 .../main/res/drawable-hdpi/ic_check_white_24dp.png | Bin 0 -> 309 bytes
 .../main/res/drawable-hdpi/ic_close_white_24dp.png | Bin 0 -> 324 bytes
 .../drawable-hdpi/ic_expand_less_black_24dp.png    | Bin 0 -> 234 bytes
 .../drawable-hdpi/ic_expand_more_black_24dp.png    | Bin 0 -> 244 bytes
 .../res/drawable-hdpi/ic_refresh_white_24dp.png    | Bin 0 -> 531 bytes
 .../main/res/drawable-mdpi/ic_action_collapse.png  | Bin 404 -> 0 bytes
 .../main/res/drawable-mdpi/ic_action_expand.png    | Bin 345 -> 0 bytes
 .../main/res/drawable-mdpi/ic_check_white_24dp.png | Bin 0 -> 243 bytes
 .../main/res/drawable-mdpi/ic_close_white_24dp.png | Bin 0 -> 279 bytes
 .../drawable-mdpi/ic_expand_less_black_24dp.png    | Bin 0 -> 206 bytes
 .../drawable-mdpi/ic_expand_more_black_24dp.png    | Bin 0 -> 206 bytes
 .../res/drawable-mdpi/ic_refresh_white_24dp.png    | Bin 0 -> 346 bytes
 .../main/res/drawable-xhdpi/ic_action_collapse.png | Bin 631 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_action_expand.png   | Bin 582 -> 0 bytes
 .../res/drawable-xhdpi/ic_check_white_24dp.png     | Bin 0 -> 363 bytes
 .../res/drawable-xhdpi/ic_close_white_24dp.png     | Bin 0 -> 402 bytes
 .../drawable-xhdpi/ic_expand_less_black_24dp.png   | Bin 0 -> 259 bytes
 .../drawable-xhdpi/ic_expand_more_black_24dp.png   | Bin 0 -> 272 bytes
 .../res/drawable-xhdpi/ic_refresh_white_24dp.png   | Bin 0 -> 637 bytes
 .../res/drawable-xxhdpi/ic_action_collapse.png     | Bin 901 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_action_expand.png  | Bin 974 -> 0 bytes
 .../res/drawable-xxhdpi/ic_check_white_24dp.png    | Bin 0 -> 460 bytes
 .../res/drawable-xxhdpi/ic_close_white_24dp.png    | Bin 0 -> 492 bytes
 .../drawable-xxhdpi/ic_expand_less_black_24dp.png  | Bin 0 -> 304 bytes
 .../drawable-xxhdpi/ic_expand_more_black_24dp.png  | Bin 0 -> 316 bytes
 .../res/drawable-xxhdpi/ic_refresh_white_24dp.png  | Bin 0 -> 875 bytes
 .../res/drawable-xxxhdpi/ic_check_white_24dp.png   | Bin 0 -> 587 bytes
 .../res/drawable-xxxhdpi/ic_close_white_24dp.png   | Bin 0 -> 662 bytes
 .../drawable-xxxhdpi/ic_expand_less_black_24dp.png | Bin 0 -> 360 bytes
 .../drawable-xxxhdpi/ic_expand_more_black_24dp.png | Bin 0 -> 379 bytes
 .../res/drawable-xxxhdpi/ic_refresh_white_24dp.png | Bin 0 -> 1148 bytes
 .../main/res/layout/actionbar_custom_view_done.xml |  26 -------------
 .../layout/actionbar_custom_view_done_cancel.xml   |  28 --------------
 .../res/layout/actionbar_include_cancel_button.xml |  41 ---------------------
 .../res/layout/actionbar_include_done_button.xml   |  41 ---------------------
 .../src/main/res/layout/foldable_linearlayout.xml  |   2 +-
 .../src/main/res/layout/full_screen_dialog.xml     |  10 +++++
 .../src/main/res/layout/full_screen_dialog_2.xml   |  12 ++++++
 .../layout/full_screen_dialog_2_cancel_button.xml  |  27 ++++++++++++++
 .../layout/full_screen_dialog_2_done_button.xml    |  27 ++++++++++++++
 .../res/layout/full_screen_dialog_done_button.xml  |  25 +++++++++++++
 .../src/main/res/layout/full_screen_dialog_old.xml |  10 +++++
 OpenKeychain/src/main/res/values/strings.xml       |   2 +-
 OpenKeychain/src/main/res/values/themes.xml        |   2 +-
 46 files changed, 114 insertions(+), 139 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png
deleted file mode 100644
index e9d2dcb46..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png
deleted file mode 100644
index 29f4de211..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..f42a0e2d2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..0fd15563a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..35e3b426f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..ed993f35d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..cd16fdd50
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png
deleted file mode 100644
index 4ac28f270..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png
deleted file mode 100644
index bb46bb315..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..e91f9048b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..e80681aeb
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..a5ab2c5d3
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..73fc3b422
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..235c84f1e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png
deleted file mode 100644
index 60ac6b066..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png
deleted file mode 100644
index 76937f57a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..e5024472a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..76e07f097
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..47c7b52a1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..45d30d999
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..5f89fc257
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png
deleted file mode 100644
index 76ec594dc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png
deleted file mode 100644
index 22003198b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..6e03d54cf
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..0eb9d8b08
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..0470e3f02
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..aadd04af6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..72128fe69
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..87892840e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..7b2a480a0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..08ae54533
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..228b2a982
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..d271d8e03
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
deleted file mode 100644
index b219038b2..000000000
--- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:dividerPadding="12dp"
-    android:orientation="horizontal"
-    android:showDividers="end" >
-
-    <include layout="@layout/actionbar_include_done_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
deleted file mode 100644
index e9047e759..000000000
--- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:dividerPadding="12dp"
-    android:orientation="horizontal"
-    android:showDividers="middle">
-
-    <include layout="@layout/actionbar_include_cancel_button" />
-
-    <include layout="@layout/actionbar_include_done_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml
deleted file mode 100644
index ec27e394a..000000000
--- a/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actionbar_cancel"
-    style="@style/Widget.AppCompat.ActionButton"
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-    android:layout_weight="1">
-
-    <!--
-        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
-        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
-    -->
-    <TextView
-        android:id="@+id/actionbar_cancel_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:drawableLeft="@drawable/ic_action_cancel"
-        android:drawablePadding="8dp"
-        android:gravity="center_vertical"
-        android:paddingRight="20dp"
-        android:filterTouchesWhenObscured="true"
-        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
-        android:text="Cancel (set in-code!)" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml
deleted file mode 100644
index 2590f272c..000000000
--- a/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actionbar_done"
-    style="@style/Widget.AppCompat.ActionButton"
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-    android:layout_weight="1">
-
-    <!--
-        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
-        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
-    -->
-    <TextView
-        android:id="@+id/actionbar_done_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:drawableLeft="@drawable/ic_action_done"
-        android:drawablePadding="8dp"
-        android:gravity="center_vertical"
-        android:paddingRight="20dp"
-        android:filterTouchesWhenObscured="true"
-        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
-        android:text="Done (set in-code!)" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
index 13cf7c225..d6165c1e0 100644
--- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
+++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
@@ -17,7 +17,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="10dp"
-                android:src="@drawable/ic_action_expand"/>
+                android:src="@drawable/ic_expand_more_black_24dp"/>
 
         <TextView
                 android:id="@+id/foldableText"
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog.xml
new file mode 100644
index 000000000..5eb50da07
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog.xml
@@ -0,0 +1,10 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="middle">
+
+    <include layout="@layout/full_screen_dialog_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml
new file mode 100644
index 000000000..b1d5efe76
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml
@@ -0,0 +1,12 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="middle">
+
+    <include layout="@layout/full_screen_dialog_2_cancel_button" />
+
+    <include layout="@layout/full_screen_dialog_2_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml
new file mode 100644
index 000000000..7c2c2a62d
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml
@@ -0,0 +1,27 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_cancel"
+    style="@style/Widget.AppCompat.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1">
+
+    <!--
+        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
+        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
+    -->
+    <TextView
+        android:id="@+id/actionbar_cancel_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_close_white_24dp"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        android:filterTouchesWhenObscured="true"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:text="Cancel (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml
new file mode 100644
index 000000000..cd24a1e6d
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml
@@ -0,0 +1,27 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_done"
+    style="@style/Widget.AppCompat.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1">
+
+    <!--
+        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
+        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
+    -->
+    <TextView
+        android:id="@+id/actionbar_done_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_check_white_24dp"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        android:filterTouchesWhenObscured="true"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:text="Done (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml
new file mode 100644
index 000000000..49018fee1
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml
@@ -0,0 +1,25 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/full_screen_dialog_done"
+    style="@style/Widget.AppCompat.ActionButton"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <!--
+        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
+        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
+    -->
+    <TextView
+        android:id="@+id/full_screen_dialog_done_text"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center_vertical"
+        android:paddingRight="16dp"
+        android:paddingEnd="16dp"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:filterTouchesWhenObscured="true"
+        android:text="Done (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml
new file mode 100644
index 000000000..ed375094f
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml
@@ -0,0 +1,10 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="end" >
+
+    <include layout="@layout/full_screen_dialog_2_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 95e224672..459bdf99c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
     <string name="title_preferences">"Settings"</string>
     <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string>
     <string name="title_api_registered_apps">"Apps"</string>
-    <string name="title_key_server_preference">"Keyserver Preference"</string>
+    <string name="title_key_server_preference">"Keyservers"</string>
     <string name="title_change_passphrase">"Change Passphrase"</string>
     <string name="title_share_fingerprint_with">"Share fingerprint with…"</string>
     <string name="title_share_key">"Share key with…"</string>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 602c85247..deab168d3 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -18,7 +18,7 @@
         <!-- Background for the actions section (e.g. voice, submit) -->
         <!--<item name="submitBackground">...</item>-->
         <!-- Close button icon -->
-        <!--<item name="closeIcon">...</item>-->
+        <item name="closeIcon">@drawable/ic_close_white_24dp</item>
         <!-- Search button icon -->
         <!--<item name="searchIcon">...</item>-->
         <!-- Go/commit button icon -->
-- 
cgit v1.2.3