From d044daeedd9ae42e72ce3d3b2ed191778b173943 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 7 Jul 2014 17:32:16 +0200
Subject: get rid of AppMsg library

---
 OpenKeychain/src/main/res/values/colors.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index c0042d215..449a09003 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -5,6 +5,7 @@
     <color name="emphasis_dark">#9933cc</color>
     <color name="bg_gray">#cecbce</color>
     <color name="tertiary_text_light">#808080</color>
+    <color name="alert">#ffdd3333</color>
 
     <color name="holo_gray_light">#33999999</color>
     <color name="holo_gray_bright">#33CCCCCC</color>
-- 
cgit v1.2.3


From 2c62aa90c0560c975d34b39df4379b5e1fcd6884 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 7 Jul 2014 17:34:41 +0200
Subject: use SuperToast instead of AppMsg in code, part 1

---
 OpenKeychain/src/main/res/layout/certify_key_activity.xml | 1 -
 OpenKeychain/src/main/res/layout/key_list_activity.xml    | 6 ++++++
 OpenKeychain/src/main/res/values/strings.xml              | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index bb43fa805..1443ffd46 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml
index c4c2c35cb..156351887 100644
--- a/OpenKeychain/src/main/res/layout/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml
@@ -4,6 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
+    <LinearLayout
+        android:id="@+id/card_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
     <include layout="@layout/key_list_content"/>
 
     <include layout="@layout/drawer_list" />
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 29780f235..36002b763 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -656,6 +656,7 @@
     <string name="msg_mf_unlock">Unlocking keyring</string>
 
     <!-- unsorted -->
+    <string name="internal_error">Internal error!</string>
     <string name="section_certifier_id">Certifier</string>
     <string name="section_cert">Certificate Details</string>
     <string name="label_user_id">Identity</string>
-- 
cgit v1.2.3


From ab2b90342e805a0a625e059dcfe2db11157a5680 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 26 Jul 2014 03:47:29 +0200
Subject: test and fix: adding an empty user id should fail

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 55ecf3ae0..d1a20813b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -674,6 +674,7 @@
     <string name="msg_mf_uid_add">Adding user id %s</string>
     <string name="msg_mf_uid_primary">Changing primary uid to %s</string>
     <string name="msg_mf_uid_revoke">Revoking user id %s</string>
+    <string name="msg_mf_uid_error_empty">User ID must not be empty!</string>
     <string name="msg_mf_unlock_error">Error unlocking keyring!</string>
     <string name="msg_mf_unlock">Unlocking keyring</string>
 
-- 
cgit v1.2.3


From a8782272b3db20ba6e88acab1d035d4699aa7166 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 27 Jul 2014 00:46:38 +0200
Subject: some more work on supertoast and result parcel stuff

---
 .../src/main/res/layout/edit_key_activity.xml      | 53 +++++-----------------
 .../src/main/res/layout/edit_key_activity_new.xml  | 13 ------
 .../src/main/res/layout/key_list_activity.xml      | 15 +++---
 OpenKeychain/src/main/res/layout/notify_area.xml   |  1 -
 .../src/main/res/layout/view_key_activity.xml      |  6 +--
 5 files changed, 21 insertions(+), 67 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/edit_key_activity_new.xml

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

diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index b6c5a1c9a..7e71ccf53 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -1,46 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true"
-    android:orientation="vertical" >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp" >
+    <include layout="@layout/notify_area"/>
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="4dp"
-            android:text="@string/label_passphrase" />
+    <FrameLayout
+        android:id="@+id/edit_key_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" />
 
-        <CheckBox
-            android:id="@+id/edit_key_no_passphrase"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_no_passphrase" />
-
-        <Button
-            android:id="@+id/edit_key_btn_change_passphrase"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:padding="4dp"
-            android:text="@string/btn_set_passphrase"
-            android:drawableLeft="@drawable/ic_action_edit"
-            android:background="@drawable/button_edgy" />
-
-        <LinearLayout
-            android:id="@+id/edit_key_container"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-        </LinearLayout>
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml b/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml
deleted file mode 100644
index f96b993c5..000000000
--- a/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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">
-
-    <FrameLayout
-        android:id="@+id/edit_key_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml
index 156351887..6c9bed872 100644
--- a/OpenKeychain/src/main/res/layout/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml
@@ -2,16 +2,19 @@
 <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" >
+    android:layout_height="match_parent">
 
     <LinearLayout
-        android:id="@+id/card_container"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
+        android:layout_height="match_parent">
 
-    <include layout="@layout/key_list_content"/>
+        <include layout="@layout/notify_area"/>
 
-    <include layout="@layout/drawer_list" />
+        <include layout="@layout/key_list_content"/>
+
+        <include layout="@layout/drawer_list" />
+
+    </LinearLayout>
 
 </android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/notify_area.xml b/OpenKeychain/src/main/res/layout/notify_area.xml
index d1ba265a5..d2188b2a1 100644
--- a/OpenKeychain/src/main/res/layout/notify_area.xml
+++ b/OpenKeychain/src/main/res/layout/notify_area.xml
@@ -6,7 +6,6 @@
         android:id="@+id/card_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/emphasis"
         android:orientation="vertical" />
 
 </merge>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 481b1ddf5..3aaa96cda 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -4,11 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/card_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
+    <include layout="@layout/notify_area"/>
 
     <TextView
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From f4ee71e3ef0dcacf691def97a94880b277a99496 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 27 Jul 2014 01:22:10 +0200
Subject: introduce EditKeyResult with transient UncachedKeyRing (half-baked!)

---
 OpenKeychain/src/main/res/values-es/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-fr/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-it/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-ja/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-ru/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-uk/strings.xml | 2 +-
 OpenKeychain/src/main/res/values/strings.xml    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 50afd5c57..002243482 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -370,7 +370,7 @@
     <item quantity="one">Clave%2$s importada con éxito.</item>
     <item quantity="other">%1$d claves%2$s importadas con éxito.</item>
   </plurals>
-  <string name="import_view_log">Ver registro (log)</string>
+  <string name="view_log">Ver registro (log)</string>
   <string name="import_error_nothing">No hay nada que importar.</string>
   <string name="import_error">¡Error importando claves!</string>
   <string name="import_with_warnings">, con advertencias</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index f3627e9eb..a3030a65e 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -358,7 +358,7 @@
     <item quantity="one">Clef importée avec succès</item>
     <item quantity="other">%1$d clefs importées avec succès</item>
   </plurals>
-  <string name="import_view_log">Consulter le journal</string>
+  <string name="view_log">Consulter le journal</string>
   <string name="import_error_nothing">Rien à importer.</string>
   <string name="import_error">Erreur lors de l\'importation des clefs !</string>
   <string name="import_with_warnings">, avec des avertissements</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index c8ec2614d..476b7fb31 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -354,7 +354,7 @@
   <string name="import_clipboard_button">Ottieni chiave dagli appunti</string>
   <string name="import_keybase_button">Ottieni chiave da Keybase.io</string>
   <!--Import result toast-->
-  <string name="import_view_log">Mostra registro</string>
+  <string name="view_log">Mostra registro</string>
   <string name="import_error_nothing">Niente da importare</string>
   <string name="import_error">Errore di importazione chiavi!</string>
   <string name="import_with_warnings">, con avvisi</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 13463df25..db1150102 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -358,7 +358,7 @@
   <plurals name="import_keys_updated">
     <item quantity="other">%1$d の鍵%2$sのアップデートに成功。</item>
   </plurals>
-  <string name="import_view_log">ログを見る</string>
+  <string name="view_log">ログを見る</string>
   <string name="import_error_nothing">インポートするものがありません。</string>
   <string name="import_error">鍵のインポートのエラー!</string>
   <string name="import_with_warnings">、とワーニング</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 539a431b5..d15e35f50 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -371,7 +371,7 @@
     <item quantity="few">и обновлено %1$d ключей%2$s.</item>
     <item quantity="other">и обновлено %1$d ключей%2$s.</item>
   </plurals>
-  <string name="import_view_log">Смотреть журнал</string>
+  <string name="view_log">Смотреть журнал</string>
   <string name="import_error_nothing">Нет данных для импорта.</string>
   <string name="import_error">Ошибка импорта ключей!</string>
   <string name="import_with_warnings">, с предупреждениями</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 6f5cc7cf1..90ad799a5 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -352,7 +352,7 @@
   <string name="import_clipboard_button">Отримати ключ з буфера обміну</string>
   <string name="import_keybase_button">Отримати ключ із Keybase.io</string>
   <!--Import result toast-->
-  <string name="import_view_log">Переглянути журнал</string>
+  <string name="view_log">Переглянути журнал</string>
   <string name="import_error_nothing">Нема що імпортувати.</string>
   <string name="import_error">Помилка імпорту ключів!</string>
   <!--Intent labels-->
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 4519688ac..46760691d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -403,7 +403,7 @@
         <item quantity="one">Successfully updated key%2$s.</item>
         <item quantity="other">Successfully updated %1$d keys%2$s.</item>
     </plurals>
-    <string name="import_view_log">View Log</string>
+    <string name="view_log">View Log</string>
     <string name="import_error_nothing">Nothing to import.</string>
     <string name="import_error">Error importing keys!</string>
     <string name="import_with_warnings">, with warnings</string>
-- 
cgit v1.2.3


From dab540e121d622236dd723e31b611624ffb976ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 27 Jul 2014 17:56:52 +0200
Subject: Work on first time wizard design

---
 .../src/main/res/layout/certify_key_activity.xml   |   1 -
 .../src/main/res/layout/create_key_activity.xml    | 114 +++++++++++++--------
 .../src/main/res/layout/first_time_activity.xml    |  84 +++++++--------
 OpenKeychain/src/main/res/values/strings.xml       |   5 +
 4 files changed, 120 insertions(+), 84 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index bb43fa805..1443ffd46 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 673f43084..050aa2b23 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -1,54 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:orientation="vertical">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
 
-    <TextView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="4dp"
-        android:text="Enter Full Name, Email and Passphrase!"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical">
 
-    <AutoCompleteTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="textPersonName"
-        android:hint="Name"
-        android:ems="10"
-        android:id="@+id/name" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingBottom="8dp"
+            android:text="@string/create_key_text"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <AutoCompleteTextView
-        android:id="@+id/email"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="bla@example.com"
-        android:layout_weight="1"
-        android:ems="10"
-        android:inputType="textEmailAddress" />
+        <AutoCompleteTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:inputType="textPersonName"
+            android:hint="@string/label_name"
+            android:ems="10"
+            android:id="@+id/name" />
 
-    <EditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="textPassword"
-        android:hint="passphrase"
-        android:ems="10"
-        android:id="@+id/passphrase"
-        android:layout_gravity="center_horizontal" />
+        <AutoCompleteTextView
+            android:id="@+id/email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:hint="@string/label_email"
+            android:ems="10"
+            android:inputType="textEmailAddress" />
 
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:inputType="textPassword"
+            android:hint="@string/label_passphrase"
+            android:ems="10"
+            android:id="@+id/passphrase"
+            android:layout_gravity="center_horizontal" />
 
-    <Button
-        android:id="@+id/create_key_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center_horizontal"
-        android:layout_margin="8dp"
-        android:text="@string/first_time_create_key"
-        android:background="@drawable/button_edgy"
-        android:drawableLeft="@drawable/ic_action_new_account" />
+        <CheckBox
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:text="@string/create_key_upload"
+            android:id="@+id/create_key_upload" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/create_key_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/first_time_create_key"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_new_account"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 514f34212..37bad7c9b 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -5,44 +5,6 @@
     android:paddingTop="16dp"
     android:paddingBottom="8dp">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/app_name"
-            android:drawableLeft="@drawable/ic_launcher"
-            android:drawablePadding="16dp"
-            android:gravity="center"
-            android:layout_gravity="center_horizontal" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_marginLeft="64dp"
-            android:layout_marginRight="64dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            android:layout_height="256dp"
-            android:src="@drawable/first_time_1" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="64dp"
-            android:layout_marginRight="64dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/first_time_text1"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_horizontal" />
-
-
-    </LinearLayout>
-
     <Button
         android:id="@+id/first_time_cancel"
         android:layout_alignParentBottom="true"
@@ -55,6 +17,7 @@
         android:background="@drawable/button_edgy" />
 
     <LinearLayout
+        android:id="@+id/first_time_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/first_time_cancel"
@@ -67,7 +30,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_weight="1"
             android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginRight="4dp"
             android:text="@string/first_time_create_key"
             android:background="@drawable/button_edgy"
             android:drawableLeft="@drawable/ic_action_new_account" />
@@ -78,12 +41,53 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="8dp"
+            android:layout_marginLeft="4dp"
             android:layout_marginRight="8dp"
             android:text="@string/first_time_import_key"
             android:background="@drawable/button_edgy"
             android:drawableLeft="@drawable/ic_action_download" />
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_above="@+id/first_time_buttons">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/app_name"
+            android:drawableLeft="@drawable/ic_launcher"
+            android:drawablePadding="16dp"
+            android:gravity="center"
+            android:layout_gravity="center_horizontal" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:adjustViewBounds="true"
+            android:src="@drawable/first_time_1"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="64dp"
+            android:layout_marginRight="64dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/first_time_text1"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:layout_marginBottom="16dp" />
+
+    </LinearLayout>
+
 
 </RelativeLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d1a20813b..dd8ae0ac1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -487,6 +487,11 @@
         <item>Revoke Subkey</item>
     </string-array>
 
+    <!-- Create key -->
+    <string name="create_key_text">Enter Full Name, Email and Passphrase!</string>
+    <string name="create_key_upload">Upload key to keyserver</string>
+    <string name="create_key_empty">This field is required</string>
+
     <!-- Navigation Drawer -->
     <string name="nav_keys">Keys</string>
     <string name="nav_encrypt">Sign and Encrypt</string>
-- 
cgit v1.2.3


From 0403cbf11ac0b5ada7624578b7a0c398c3fa6904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 27 Jul 2014 18:12:14 +0200
Subject: Prettify buttons

---
 .../src/main/res/layout/first_time_activity.xml    | 104 ++++++++++++++-------
 1 file changed, 70 insertions(+), 34 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 37bad7c9b..e1a67a077 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -2,50 +2,86 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingTop="16dp"
-    android:paddingBottom="8dp">
-
-    <Button
-        android:id="@+id/first_time_cancel"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:text="@string/first_time_skip"
-        android:background="@drawable/button_edgy" />
+    android:paddingTop="16dp">
 
     <LinearLayout
         android:id="@+id/first_time_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/first_time_cancel"
-        android:orientation="horizontal">
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical">
 
-        <Button
-            android:id="@+id/first_time_create_key"
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="4dp"
-            android:text="@string/first_time_create_key"
-            android:background="@drawable/button_edgy"
-            android:drawableLeft="@drawable/ic_action_new_account" />
-
-        <Button
-            android:id="@+id/first_time_import_key"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/first_time_create_key"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/first_time_create_key"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:drawableRight="@drawable/ic_action_new_account"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:clickable="true"
+                style="@style/SelectableItem" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:id="@+id/first_time_import_key"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/first_time_import_key"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:drawableRight="@drawable/ic_action_download"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:clickable="true"
+                style="@style/SelectableItem" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/first_time_cancel"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="8dp"
-            android:text="@string/first_time_import_key"
-            android:background="@drawable/button_edgy"
-            android:drawableLeft="@drawable/ic_action_download" />
+            android:text="@string/first_time_skip"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:gravity="center"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:layout_gravity="center_horizontal" />
+
     </LinearLayout>
 
     <LinearLayout
-- 
cgit v1.2.3


From 57d9c7a013cefa6641bff7167486f7fe12247265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 27 Jul 2014 20:42:39 +0200
Subject: Open keyboard on passphrase dialog, this should now work on all
 Android versions... hopefully

---
 OpenKeychain/src/main/res/layout/create_key_activity.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 050aa2b23..9d56950a8 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -22,6 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
+            android:imeOptions="actionNext"
             android:inputType="textPersonName"
             android:hint="@string/label_name"
             android:ems="10"
@@ -32,6 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
+            android:imeOptions="actionNext"
             android:hint="@string/label_email"
             android:ems="10"
             android:inputType="textEmailAddress" />
-- 
cgit v1.2.3


From 5974dccbeaf672db76cb3be7ee639f2bd6638a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 27 Jul 2014 21:40:43 +0200
Subject: Redesigned QR Code view

---
 OpenKeychain/src/main/res/anim/zoom_enter.xml         | 16 ++++++++++++++++
 OpenKeychain/src/main/res/anim/zoom_exit.xml          | 17 +++++++++++++++++
 OpenKeychain/src/main/res/layout/qr_code_activity.xml | 14 ++++++++++++++
 .../src/main/res/layout/share_qr_code_dialog.xml      | 19 -------------------
 4 files changed, 47 insertions(+), 19 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/anim/zoom_enter.xml
 create mode 100644 OpenKeychain/src/main/res/anim/zoom_exit.xml
 create mode 100644 OpenKeychain/src/main/res/layout/qr_code_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/share_qr_code_dialog.xml

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

diff --git a/OpenKeychain/src/main/res/anim/zoom_enter.xml b/OpenKeychain/src/main/res/anim/zoom_enter.xml
new file mode 100644
index 000000000..2b95cfba6
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/zoom_enter.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
+    <scale
+        android:fromXScale="0.5"
+        android:toXScale="1.0"
+        android:fromYScale="0.5"
+        android:toYScale="1.0"
+        android:pivotX="50%p"
+        android:pivotY="50%p"
+        android:duration="@android:integer/config_mediumAnimTime" />
+    <alpha
+        android:fromAlpha="0"
+        android:toAlpha="1.0"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/zoom_exit.xml b/OpenKeychain/src/main/res/anim/zoom_exit.xml
new file mode 100644
index 000000000..772375739
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/zoom_exit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:zAdjustment="top">
+    <scale
+        android:fromXScale="1.0"
+        android:toXScale="0.5"
+        android:fromYScale="1.0"
+        android:toYScale="0.5"
+        android:pivotX="50%p"
+        android:pivotY="50%p"
+        android:duration="@android:integer/config_mediumAnimTime" />
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
new file mode 100644
index 000000000..57c869db6
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/qr_code_image"
+        android:padding="32dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SelectableItem" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/share_qr_code_dialog.xml b/OpenKeychain/src/main/res/layout/share_qr_code_dialog.xml
deleted file mode 100644
index 0b58ae72f..000000000
--- a/OpenKeychain/src/main/res/layout/share_qr_code_dialog.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/share_qr_code_dialog_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:textAppearance="@android:style/TextAppearance.Medium" />
-
-    <ImageView
-        android:id="@+id/share_qr_code_dialog_image"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 6c7e3aee91de25b09c569e4f51bf36c1c3d73d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 27 Jul 2014 21:45:48 +0200
Subject: Fix background color of notify area

---
 OpenKeychain/src/main/res/layout/notify_area.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/notify_area.xml b/OpenKeychain/src/main/res/layout/notify_area.xml
index d1ba265a5..43df1cde8 100644
--- a/OpenKeychain/src/main/res/layout/notify_area.xml
+++ b/OpenKeychain/src/main/res/layout/notify_area.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
         android:id="@+id/card_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/emphasis"
         android:orientation="vertical" />
 
 </merge>
\ No newline at end of file
-- 
cgit v1.2.3


From 61944b9e39eb85db423636639315640aa6ebb3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 28 Jul 2014 01:12:23 +0200
Subject: Add icons from ModernPGP project

---
 .../src/main/res/drawable-hdpi/status_lock-closed.png    | Bin 0 -> 911 bytes
 .../src/main/res/drawable-hdpi/status_lock-error.png     | Bin 0 -> 1008 bytes
 .../src/main/res/drawable-hdpi/status_lock-open.png      | Bin 0 -> 911 bytes
 .../drawable-hdpi/status_signature-expired-cutout.png    | Bin 0 -> 1179 bytes
 .../main/res/drawable-hdpi/status_signature-expired.png  | Bin 0 -> 1049 bytes
 .../drawable-hdpi/status_signature-invalid-cutout.png    | Bin 0 -> 676 bytes
 .../main/res/drawable-hdpi/status_signature-invalid.png  | Bin 0 -> 736 bytes
 .../drawable-hdpi/status_signature-revoked-cutout.png    | Bin 0 -> 1218 bytes
 .../main/res/drawable-hdpi/status_signature-revoked.png  | Bin 0 -> 1033 bytes
 .../drawable-hdpi/status_signature-unknown-cutout.png    | Bin 0 -> 1043 bytes
 .../main/res/drawable-hdpi/status_signature-unknown.png  | Bin 0 -> 906 bytes
 .../drawable-hdpi/status_signature-unverified-cutout.png | Bin 0 -> 1166 bytes
 .../res/drawable-hdpi/status_signature-unverified.png    | Bin 0 -> 706 bytes
 .../drawable-hdpi/status_signature-verified-cutout.png   | Bin 0 -> 1017 bytes
 .../main/res/drawable-hdpi/status_signature-verified.png | Bin 0 -> 784 bytes
 .../src/main/res/drawable-mdpi/status_lock-closed.png    | Bin 0 -> 675 bytes
 .../src/main/res/drawable-mdpi/status_lock-error.png     | Bin 0 -> 748 bytes
 .../src/main/res/drawable-mdpi/status_lock-open.png      | Bin 0 -> 675 bytes
 .../drawable-mdpi/status_signature-expired-cutout.png    | Bin 0 -> 789 bytes
 .../main/res/drawable-mdpi/status_signature-expired.png  | Bin 0 -> 723 bytes
 .../drawable-mdpi/status_signature-invalid-cutout.png    | Bin 0 -> 444 bytes
 .../main/res/drawable-mdpi/status_signature-invalid.png  | Bin 0 -> 528 bytes
 .../drawable-mdpi/status_signature-revoked-cutout.png    | Bin 0 -> 861 bytes
 .../main/res/drawable-mdpi/status_signature-revoked.png  | Bin 0 -> 714 bytes
 .../drawable-mdpi/status_signature-unknown-cutout.png    | Bin 0 -> 740 bytes
 .../main/res/drawable-mdpi/status_signature-unknown.png  | Bin 0 -> 640 bytes
 .../drawable-mdpi/status_signature-unverified-cutout.png | Bin 0 -> 813 bytes
 .../res/drawable-mdpi/status_signature-unverified.png    | Bin 0 -> 536 bytes
 .../drawable-mdpi/status_signature-verified-cutout.png   | Bin 0 -> 695 bytes
 .../main/res/drawable-mdpi/status_signature-verified.png | Bin 0 -> 541 bytes
 .../src/main/res/drawable-xhdpi/status_lock-closed.png   | Bin 0 -> 1160 bytes
 .../src/main/res/drawable-xhdpi/status_lock-error.png    | Bin 0 -> 1316 bytes
 .../src/main/res/drawable-xhdpi/status_lock-open.png     | Bin 0 -> 1165 bytes
 .../drawable-xhdpi/status_signature-expired-cutout.png   | Bin 0 -> 1590 bytes
 .../main/res/drawable-xhdpi/status_signature-expired.png | Bin 0 -> 1429 bytes
 .../drawable-xhdpi/status_signature-invalid-cutout.png   | Bin 0 -> 694 bytes
 .../main/res/drawable-xhdpi/status_signature-invalid.png | Bin 0 -> 840 bytes
 .../drawable-xhdpi/status_signature-revoked-cutout.png   | Bin 0 -> 1660 bytes
 .../main/res/drawable-xhdpi/status_signature-revoked.png | Bin 0 -> 1353 bytes
 .../drawable-xhdpi/status_signature-unknown-cutout.png   | Bin 0 -> 1377 bytes
 .../main/res/drawable-xhdpi/status_signature-unknown.png | Bin 0 -> 1231 bytes
 .../status_signature-unverified-cutout.png               | Bin 0 -> 1555 bytes
 .../res/drawable-xhdpi/status_signature-unverified.png   | Bin 0 -> 946 bytes
 .../drawable-xhdpi/status_signature-verified-cutout.png  | Bin 0 -> 1319 bytes
 .../res/drawable-xhdpi/status_signature-verified.png     | Bin 0 -> 1012 bytes
 .../src/main/res/drawable-xxhdpi/status_lock-closed.png  | Bin 0 -> 1740 bytes
 .../src/main/res/drawable-xxhdpi/status_lock-error.png   | Bin 0 -> 1919 bytes
 .../src/main/res/drawable-xxhdpi/status_lock-open.png    | Bin 0 -> 1764 bytes
 .../drawable-xxhdpi/status_signature-expired-cutout.png  | Bin 0 -> 2411 bytes
 .../res/drawable-xxhdpi/status_signature-expired.png     | Bin 0 -> 2075 bytes
 .../drawable-xxhdpi/status_signature-invalid-cutout.png  | Bin 0 -> 958 bytes
 .../res/drawable-xxhdpi/status_signature-invalid.png     | Bin 0 -> 1207 bytes
 .../drawable-xxhdpi/status_signature-revoked-cutout.png  | Bin 0 -> 2475 bytes
 .../res/drawable-xxhdpi/status_signature-revoked.png     | Bin 0 -> 1989 bytes
 .../drawable-xxhdpi/status_signature-unknown-cutout.png  | Bin 0 -> 2105 bytes
 .../res/drawable-xxhdpi/status_signature-unknown.png     | Bin 0 -> 1913 bytes
 .../status_signature-unverified-cutout.png               | Bin 0 -> 2314 bytes
 .../res/drawable-xxhdpi/status_signature-unverified.png  | Bin 0 -> 1413 bytes
 .../drawable-xxhdpi/status_signature-verified-cutout.png | Bin 0 -> 2148 bytes
 .../res/drawable-xxhdpi/status_signature-verified.png    | Bin 0 -> 1584 bytes
 60 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png
new file mode 100644
index 000000000..7c6bb2d18
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png
new file mode 100644
index 000000000..da4a5d89a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png
new file mode 100644
index 000000000..cd02fc1e4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png
new file mode 100644
index 000000000..83f6fde35
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png
new file mode 100644
index 000000000..f5105c1ae
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png
new file mode 100644
index 000000000..29830f5ba
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png
new file mode 100644
index 000000000..67880d6db
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png
new file mode 100644
index 000000000..2f7695043
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png
new file mode 100644
index 000000000..2ed67419b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png
new file mode 100644
index 000000000..2ce28c7ca
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png
new file mode 100644
index 000000000..a6f1f2792
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png
new file mode 100644
index 000000000..442c55eee
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png
new file mode 100644
index 000000000..c25a84b4d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png
new file mode 100644
index 000000000..160ec7cbe
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png
new file mode 100644
index 000000000..6f435a85e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png
new file mode 100644
index 000000000..a1b090630
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png
new file mode 100644
index 000000000..e567055aa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png
new file mode 100644
index 000000000..98e32eadc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png
new file mode 100644
index 000000000..84ac9bec2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png
new file mode 100644
index 000000000..21e8b536a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png
new file mode 100644
index 000000000..967e00e80
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png
new file mode 100644
index 000000000..9ae2a09ab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png
new file mode 100644
index 000000000..244dd0708
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png
new file mode 100644
index 000000000..16e1d7181
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png
new file mode 100644
index 000000000..82cc25a4b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png
new file mode 100644
index 000000000..5c3ba866d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png
new file mode 100644
index 000000000..e752eaeab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png
new file mode 100644
index 000000000..b8b472a5a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png
new file mode 100644
index 000000000..08a9f464c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png
new file mode 100644
index 000000000..d8141b47b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png
new file mode 100644
index 000000000..5a9664d59
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png
new file mode 100644
index 000000000..608f065af
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png
new file mode 100644
index 000000000..ee34dd396
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png
new file mode 100644
index 000000000..33a3efed1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png
new file mode 100644
index 000000000..f475c9d84
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png
new file mode 100644
index 000000000..bc39d3496
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png
new file mode 100644
index 000000000..f21c2cf52
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png
new file mode 100644
index 000000000..58929661f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png
new file mode 100644
index 000000000..be1a1d9dc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png
new file mode 100644
index 000000000..3020357a4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png
new file mode 100644
index 000000000..841cfa958
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png
new file mode 100644
index 000000000..3829bb3a0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png
new file mode 100644
index 000000000..525d1cf6b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png
new file mode 100644
index 000000000..3548ee2b6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png
new file mode 100644
index 000000000..54eee5ba0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png
new file mode 100644
index 000000000..4116e13fa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png
new file mode 100644
index 000000000..6053b7bec
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png
new file mode 100644
index 000000000..67b4ae314
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png
new file mode 100644
index 000000000..df385bb1b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png
new file mode 100644
index 000000000..1fec93532
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png
new file mode 100644
index 000000000..aeb899599
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png
new file mode 100644
index 000000000..fa5a05274
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png
new file mode 100644
index 000000000..d77c5e1c1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png
new file mode 100644
index 000000000..a649b39cf
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png
new file mode 100644
index 000000000..ee0661234
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png
new file mode 100644
index 000000000..dba881859
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png
new file mode 100644
index 000000000..1602747f1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png
new file mode 100644
index 000000000..38cf0cebc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png
new file mode 100644
index 000000000..61c23f749
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png
new file mode 100644
index 000000000..11ad802fa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png differ
-- 
cgit v1.2.3


From b2f7e839e1fab5bb36116f60c3c2ab8ecaf31e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 28 Jul 2014 01:23:38 +0200
Subject: Fix resource names, add small test

---
 .../src/main/res/drawable-hdpi/status_lock-closed.png    | Bin 911 -> 0 bytes
 .../src/main/res/drawable-hdpi/status_lock-error.png     | Bin 1008 -> 0 bytes
 .../src/main/res/drawable-hdpi/status_lock-open.png      | Bin 911 -> 0 bytes
 .../src/main/res/drawable-hdpi/status_lock_closed.png    | Bin 0 -> 911 bytes
 .../src/main/res/drawable-hdpi/status_lock_error.png     | Bin 0 -> 1008 bytes
 .../src/main/res/drawable-hdpi/status_lock_open.png      | Bin 0 -> 911 bytes
 .../drawable-hdpi/status_signature-expired-cutout.png    | Bin 1179 -> 0 bytes
 .../main/res/drawable-hdpi/status_signature-expired.png  | Bin 1049 -> 0 bytes
 .../drawable-hdpi/status_signature-invalid-cutout.png    | Bin 676 -> 0 bytes
 .../main/res/drawable-hdpi/status_signature-invalid.png  | Bin 736 -> 0 bytes
 .../drawable-hdpi/status_signature-revoked-cutout.png    | Bin 1218 -> 0 bytes
 .../main/res/drawable-hdpi/status_signature-revoked.png  | Bin 1033 -> 0 bytes
 .../drawable-hdpi/status_signature-unknown-cutout.png    | Bin 1043 -> 0 bytes
 .../main/res/drawable-hdpi/status_signature-unknown.png  | Bin 906 -> 0 bytes
 .../drawable-hdpi/status_signature-unverified-cutout.png | Bin 1166 -> 0 bytes
 .../res/drawable-hdpi/status_signature-unverified.png    | Bin 706 -> 0 bytes
 .../drawable-hdpi/status_signature-verified-cutout.png   | Bin 1017 -> 0 bytes
 .../main/res/drawable-hdpi/status_signature-verified.png | Bin 784 -> 0 bytes
 .../main/res/drawable-hdpi/status_signature_expired.png  | Bin 0 -> 1049 bytes
 .../drawable-hdpi/status_signature_expired_cutout.png    | Bin 0 -> 1179 bytes
 .../main/res/drawable-hdpi/status_signature_invalid.png  | Bin 0 -> 736 bytes
 .../drawable-hdpi/status_signature_invalid_cutout.png    | Bin 0 -> 676 bytes
 .../main/res/drawable-hdpi/status_signature_revoked.png  | Bin 0 -> 1033 bytes
 .../drawable-hdpi/status_signature_revoked_cutout.png    | Bin 0 -> 1218 bytes
 .../main/res/drawable-hdpi/status_signature_unknown.png  | Bin 0 -> 906 bytes
 .../drawable-hdpi/status_signature_unknown_cutout.png    | Bin 0 -> 1043 bytes
 .../res/drawable-hdpi/status_signature_unverified.png    | Bin 0 -> 706 bytes
 .../drawable-hdpi/status_signature_unverified_cutout.png | Bin 0 -> 1166 bytes
 .../main/res/drawable-hdpi/status_signature_verified.png | Bin 0 -> 784 bytes
 .../drawable-hdpi/status_signature_verified_cutout.png   | Bin 0 -> 1017 bytes
 .../src/main/res/drawable-mdpi/status_lock-closed.png    | Bin 675 -> 0 bytes
 .../src/main/res/drawable-mdpi/status_lock-error.png     | Bin 748 -> 0 bytes
 .../src/main/res/drawable-mdpi/status_lock-open.png      | Bin 675 -> 0 bytes
 .../src/main/res/drawable-mdpi/status_lock_closed.png    | Bin 0 -> 675 bytes
 .../src/main/res/drawable-mdpi/status_lock_error.png     | Bin 0 -> 748 bytes
 .../src/main/res/drawable-mdpi/status_lock_open.png      | Bin 0 -> 675 bytes
 .../drawable-mdpi/status_signature-expired-cutout.png    | Bin 789 -> 0 bytes
 .../main/res/drawable-mdpi/status_signature-expired.png  | Bin 723 -> 0 bytes
 .../drawable-mdpi/status_signature-invalid-cutout.png    | Bin 444 -> 0 bytes
 .../main/res/drawable-mdpi/status_signature-invalid.png  | Bin 528 -> 0 bytes
 .../drawable-mdpi/status_signature-revoked-cutout.png    | Bin 861 -> 0 bytes
 .../main/res/drawable-mdpi/status_signature-revoked.png  | Bin 714 -> 0 bytes
 .../drawable-mdpi/status_signature-unknown-cutout.png    | Bin 740 -> 0 bytes
 .../main/res/drawable-mdpi/status_signature-unknown.png  | Bin 640 -> 0 bytes
 .../drawable-mdpi/status_signature-unverified-cutout.png | Bin 813 -> 0 bytes
 .../res/drawable-mdpi/status_signature-unverified.png    | Bin 536 -> 0 bytes
 .../drawable-mdpi/status_signature-verified-cutout.png   | Bin 695 -> 0 bytes
 .../main/res/drawable-mdpi/status_signature-verified.png | Bin 541 -> 0 bytes
 .../main/res/drawable-mdpi/status_signature_expired.png  | Bin 0 -> 723 bytes
 .../drawable-mdpi/status_signature_expired_cutout.png    | Bin 0 -> 789 bytes
 .../main/res/drawable-mdpi/status_signature_invalid.png  | Bin 0 -> 528 bytes
 .../drawable-mdpi/status_signature_invalid_cutout.png    | Bin 0 -> 444 bytes
 .../main/res/drawable-mdpi/status_signature_revoked.png  | Bin 0 -> 714 bytes
 .../drawable-mdpi/status_signature_revoked_cutout.png    | Bin 0 -> 861 bytes
 .../main/res/drawable-mdpi/status_signature_unknown.png  | Bin 0 -> 640 bytes
 .../drawable-mdpi/status_signature_unknown_cutout.png    | Bin 0 -> 740 bytes
 .../res/drawable-mdpi/status_signature_unverified.png    | Bin 0 -> 536 bytes
 .../drawable-mdpi/status_signature_unverified_cutout.png | Bin 0 -> 813 bytes
 .../main/res/drawable-mdpi/status_signature_verified.png | Bin 0 -> 541 bytes
 .../drawable-mdpi/status_signature_verified_cutout.png   | Bin 0 -> 695 bytes
 .../src/main/res/drawable-xhdpi/status_lock-closed.png   | Bin 1160 -> 0 bytes
 .../src/main/res/drawable-xhdpi/status_lock-error.png    | Bin 1316 -> 0 bytes
 .../src/main/res/drawable-xhdpi/status_lock-open.png     | Bin 1165 -> 0 bytes
 .../src/main/res/drawable-xhdpi/status_lock_closed.png   | Bin 0 -> 1160 bytes
 .../src/main/res/drawable-xhdpi/status_lock_error.png    | Bin 0 -> 1316 bytes
 .../src/main/res/drawable-xhdpi/status_lock_open.png     | Bin 0 -> 1165 bytes
 .../drawable-xhdpi/status_signature-expired-cutout.png   | Bin 1590 -> 0 bytes
 .../main/res/drawable-xhdpi/status_signature-expired.png | Bin 1429 -> 0 bytes
 .../drawable-xhdpi/status_signature-invalid-cutout.png   | Bin 694 -> 0 bytes
 .../main/res/drawable-xhdpi/status_signature-invalid.png | Bin 840 -> 0 bytes
 .../drawable-xhdpi/status_signature-revoked-cutout.png   | Bin 1660 -> 0 bytes
 .../main/res/drawable-xhdpi/status_signature-revoked.png | Bin 1353 -> 0 bytes
 .../drawable-xhdpi/status_signature-unknown-cutout.png   | Bin 1377 -> 0 bytes
 .../main/res/drawable-xhdpi/status_signature-unknown.png | Bin 1231 -> 0 bytes
 .../status_signature-unverified-cutout.png               | Bin 1555 -> 0 bytes
 .../res/drawable-xhdpi/status_signature-unverified.png   | Bin 946 -> 0 bytes
 .../drawable-xhdpi/status_signature-verified-cutout.png  | Bin 1319 -> 0 bytes
 .../res/drawable-xhdpi/status_signature-verified.png     | Bin 1012 -> 0 bytes
 .../main/res/drawable-xhdpi/status_signature_expired.png | Bin 0 -> 1429 bytes
 .../drawable-xhdpi/status_signature_expired_cutout.png   | Bin 0 -> 1590 bytes
 .../main/res/drawable-xhdpi/status_signature_invalid.png | Bin 0 -> 840 bytes
 .../drawable-xhdpi/status_signature_invalid_cutout.png   | Bin 0 -> 694 bytes
 .../main/res/drawable-xhdpi/status_signature_revoked.png | Bin 0 -> 1353 bytes
 .../drawable-xhdpi/status_signature_revoked_cutout.png   | Bin 0 -> 1660 bytes
 .../main/res/drawable-xhdpi/status_signature_unknown.png | Bin 0 -> 1231 bytes
 .../drawable-xhdpi/status_signature_unknown_cutout.png   | Bin 0 -> 1377 bytes
 .../res/drawable-xhdpi/status_signature_unverified.png   | Bin 0 -> 946 bytes
 .../status_signature_unverified_cutout.png               | Bin 0 -> 1555 bytes
 .../res/drawable-xhdpi/status_signature_verified.png     | Bin 0 -> 1012 bytes
 .../drawable-xhdpi/status_signature_verified_cutout.png  | Bin 0 -> 1319 bytes
 .../src/main/res/drawable-xxhdpi/status_lock-closed.png  | Bin 1740 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/status_lock-error.png   | Bin 1919 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/status_lock-open.png    | Bin 1764 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/status_lock_closed.png  | Bin 0 -> 1740 bytes
 .../src/main/res/drawable-xxhdpi/status_lock_error.png   | Bin 0 -> 1919 bytes
 .../src/main/res/drawable-xxhdpi/status_lock_open.png    | Bin 0 -> 1764 bytes
 .../drawable-xxhdpi/status_signature-expired-cutout.png  | Bin 2411 -> 0 bytes
 .../res/drawable-xxhdpi/status_signature-expired.png     | Bin 2075 -> 0 bytes
 .../drawable-xxhdpi/status_signature-invalid-cutout.png  | Bin 958 -> 0 bytes
 .../res/drawable-xxhdpi/status_signature-invalid.png     | Bin 1207 -> 0 bytes
 .../drawable-xxhdpi/status_signature-revoked-cutout.png  | Bin 2475 -> 0 bytes
 .../res/drawable-xxhdpi/status_signature-revoked.png     | Bin 1989 -> 0 bytes
 .../drawable-xxhdpi/status_signature-unknown-cutout.png  | Bin 2105 -> 0 bytes
 .../res/drawable-xxhdpi/status_signature-unknown.png     | Bin 1913 -> 0 bytes
 .../status_signature-unverified-cutout.png               | Bin 2314 -> 0 bytes
 .../res/drawable-xxhdpi/status_signature-unverified.png  | Bin 1413 -> 0 bytes
 .../drawable-xxhdpi/status_signature-verified-cutout.png | Bin 2148 -> 0 bytes
 .../res/drawable-xxhdpi/status_signature-verified.png    | Bin 1584 -> 0 bytes
 .../res/drawable-xxhdpi/status_signature_expired.png     | Bin 0 -> 2075 bytes
 .../drawable-xxhdpi/status_signature_expired_cutout.png  | Bin 0 -> 2411 bytes
 .../res/drawable-xxhdpi/status_signature_invalid.png     | Bin 0 -> 1207 bytes
 .../drawable-xxhdpi/status_signature_invalid_cutout.png  | Bin 0 -> 958 bytes
 .../res/drawable-xxhdpi/status_signature_revoked.png     | Bin 0 -> 1989 bytes
 .../drawable-xxhdpi/status_signature_revoked_cutout.png  | Bin 0 -> 2475 bytes
 .../res/drawable-xxhdpi/status_signature_unknown.png     | Bin 0 -> 1913 bytes
 .../drawable-xxhdpi/status_signature_unknown_cutout.png  | Bin 0 -> 2105 bytes
 .../res/drawable-xxhdpi/status_signature_unverified.png  | Bin 0 -> 1413 bytes
 .../status_signature_unverified_cutout.png               | Bin 0 -> 2314 bytes
 .../res/drawable-xxhdpi/status_signature_verified.png    | Bin 0 -> 1584 bytes
 .../drawable-xxhdpi/status_signature_verified_cutout.png | Bin 0 -> 2148 bytes
 OpenKeychain/src/main/res/layout/key_list_item.xml       |   4 ++--
 121 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png
deleted file mode 100644
index 7c6bb2d18..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-closed.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png
deleted file mode 100644
index da4a5d89a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png
deleted file mode 100644
index cd02fc1e4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock-open.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png
new file mode 100644
index 000000000..7c6bb2d18
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png
new file mode 100644
index 000000000..da4a5d89a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png
new file mode 100644
index 000000000..cd02fc1e4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png
deleted file mode 100644
index 83f6fde35..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png
deleted file mode 100644
index f5105c1ae..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-expired.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png
deleted file mode 100644
index 29830f5ba..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png
deleted file mode 100644
index 67880d6db..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-invalid.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png
deleted file mode 100644
index 2f7695043..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png
deleted file mode 100644
index 2ed67419b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-revoked.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png
deleted file mode 100644
index 2ce28c7ca..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png
deleted file mode 100644
index a6f1f2792..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unknown.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png
deleted file mode 100644
index 442c55eee..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png
deleted file mode 100644
index c25a84b4d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-unverified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png
deleted file mode 100644
index 160ec7cbe..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png
deleted file mode 100644
index 6f435a85e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature-verified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png
new file mode 100644
index 000000000..f5105c1ae
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png
new file mode 100644
index 000000000..83f6fde35
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png
new file mode 100644
index 000000000..67880d6db
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png
new file mode 100644
index 000000000..29830f5ba
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png
new file mode 100644
index 000000000..2ed67419b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png
new file mode 100644
index 000000000..2f7695043
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png
new file mode 100644
index 000000000..a6f1f2792
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png
new file mode 100644
index 000000000..2ce28c7ca
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png
new file mode 100644
index 000000000..c25a84b4d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png
new file mode 100644
index 000000000..442c55eee
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png
new file mode 100644
index 000000000..6f435a85e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png
new file mode 100644
index 000000000..160ec7cbe
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png
deleted file mode 100644
index a1b090630..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-closed.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png
deleted file mode 100644
index e567055aa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png
deleted file mode 100644
index 98e32eadc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock-open.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
new file mode 100644
index 000000000..a1b090630
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
new file mode 100644
index 000000000..e567055aa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
new file mode 100644
index 000000000..98e32eadc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png
deleted file mode 100644
index 84ac9bec2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png
deleted file mode 100644
index 21e8b536a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-expired.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png
deleted file mode 100644
index 967e00e80..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png
deleted file mode 100644
index 9ae2a09ab..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-invalid.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png
deleted file mode 100644
index 244dd0708..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png
deleted file mode 100644
index 16e1d7181..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-revoked.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png
deleted file mode 100644
index 82cc25a4b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png
deleted file mode 100644
index 5c3ba866d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unknown.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png
deleted file mode 100644
index e752eaeab..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png
deleted file mode 100644
index b8b472a5a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-unverified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png
deleted file mode 100644
index 08a9f464c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png
deleted file mode 100644
index d8141b47b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature-verified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
new file mode 100644
index 000000000..21e8b536a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
new file mode 100644
index 000000000..84ac9bec2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
new file mode 100644
index 000000000..9ae2a09ab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
new file mode 100644
index 000000000..967e00e80
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
new file mode 100644
index 000000000..16e1d7181
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
new file mode 100644
index 000000000..244dd0708
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
new file mode 100644
index 000000000..5c3ba866d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
new file mode 100644
index 000000000..82cc25a4b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
new file mode 100644
index 000000000..b8b472a5a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
new file mode 100644
index 000000000..e752eaeab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
new file mode 100644
index 000000000..d8141b47b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
new file mode 100644
index 000000000..08a9f464c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png
deleted file mode 100644
index 5a9664d59..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-closed.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png
deleted file mode 100644
index 608f065af..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png
deleted file mode 100644
index ee34dd396..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock-open.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png
new file mode 100644
index 000000000..5a9664d59
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png
new file mode 100644
index 000000000..608f065af
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png
new file mode 100644
index 000000000..ee34dd396
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png
deleted file mode 100644
index 33a3efed1..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png
deleted file mode 100644
index f475c9d84..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-expired.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png
deleted file mode 100644
index bc39d3496..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png
deleted file mode 100644
index f21c2cf52..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-invalid.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png
deleted file mode 100644
index 58929661f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png
deleted file mode 100644
index be1a1d9dc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-revoked.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png
deleted file mode 100644
index 3020357a4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png
deleted file mode 100644
index 841cfa958..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unknown.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png
deleted file mode 100644
index 3829bb3a0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png
deleted file mode 100644
index 525d1cf6b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-unverified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png
deleted file mode 100644
index 3548ee2b6..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png
deleted file mode 100644
index 54eee5ba0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature-verified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png
new file mode 100644
index 000000000..f475c9d84
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png
new file mode 100644
index 000000000..33a3efed1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png
new file mode 100644
index 000000000..f21c2cf52
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png
new file mode 100644
index 000000000..bc39d3496
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png
new file mode 100644
index 000000000..be1a1d9dc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png
new file mode 100644
index 000000000..58929661f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png
new file mode 100644
index 000000000..841cfa958
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png
new file mode 100644
index 000000000..3020357a4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png
new file mode 100644
index 000000000..525d1cf6b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png
new file mode 100644
index 000000000..3829bb3a0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png
new file mode 100644
index 000000000..54eee5ba0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png
new file mode 100644
index 000000000..3548ee2b6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png
deleted file mode 100644
index 4116e13fa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-closed.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png
deleted file mode 100644
index 6053b7bec..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png
deleted file mode 100644
index 67b4ae314..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock-open.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png
new file mode 100644
index 000000000..4116e13fa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png
new file mode 100644
index 000000000..6053b7bec
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png
new file mode 100644
index 000000000..67b4ae314
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png
deleted file mode 100644
index df385bb1b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png
deleted file mode 100644
index 1fec93532..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-expired.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png
deleted file mode 100644
index aeb899599..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png
deleted file mode 100644
index fa5a05274..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-invalid.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png
deleted file mode 100644
index d77c5e1c1..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png
deleted file mode 100644
index a649b39cf..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-revoked.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png
deleted file mode 100644
index ee0661234..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png
deleted file mode 100644
index dba881859..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unknown.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png
deleted file mode 100644
index 1602747f1..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png
deleted file mode 100644
index 38cf0cebc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-unverified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png
deleted file mode 100644
index 61c23f749..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified-cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png
deleted file mode 100644
index 11ad802fa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature-verified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png
new file mode 100644
index 000000000..1fec93532
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png
new file mode 100644
index 000000000..df385bb1b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png
new file mode 100644
index 000000000..fa5a05274
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png
new file mode 100644
index 000000000..aeb899599
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png
new file mode 100644
index 000000000..a649b39cf
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png
new file mode 100644
index 000000000..d77c5e1c1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png
new file mode 100644
index 000000000..dba881859
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png
new file mode 100644
index 000000000..ee0661234
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png
new file mode 100644
index 000000000..38cf0cebc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png
new file mode 100644
index 000000000..1602747f1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png
new file mode 100644
index 000000000..11ad802fa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png
new file mode 100644
index 000000000..61c23f749
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 99e4c0268..9327c66a5 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -58,9 +58,9 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/verified"
+            android:id="@+id/status_image"
             android:layout_gravity="center"
-            android:src="@drawable/key_certify_ok_depth0"
+            android:src="@drawable/status_signature_verified_cutout"
             android:padding="16dp" />
     </FrameLayout>
 
-- 
cgit v1.2.3


From 0c3b2a6ed4c0ffb3022c064e28254f6567f4ba12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 28 Jul 2014 09:10:45 +0200
Subject: Smaller status images, green test

---
 .../src/main/res/drawable-hdpi/status_lock_closed.png | Bin 911 -> 675 bytes
 .../src/main/res/drawable-hdpi/status_lock_error.png  | Bin 1008 -> 748 bytes
 .../src/main/res/drawable-hdpi/status_lock_open.png   | Bin 911 -> 675 bytes
 .../res/drawable-hdpi/status_signature_expired.png    | Bin 1049 -> 723 bytes
 .../drawable-hdpi/status_signature_expired_cutout.png | Bin 1179 -> 789 bytes
 .../res/drawable-hdpi/status_signature_invalid.png    | Bin 736 -> 528 bytes
 .../drawable-hdpi/status_signature_invalid_cutout.png | Bin 676 -> 444 bytes
 .../res/drawable-hdpi/status_signature_revoked.png    | Bin 1033 -> 714 bytes
 .../drawable-hdpi/status_signature_revoked_cutout.png | Bin 1218 -> 861 bytes
 .../res/drawable-hdpi/status_signature_unknown.png    | Bin 906 -> 640 bytes
 .../drawable-hdpi/status_signature_unknown_cutout.png | Bin 1043 -> 740 bytes
 .../res/drawable-hdpi/status_signature_unverified.png | Bin 706 -> 536 bytes
 .../status_signature_unverified_cutout.png            | Bin 1166 -> 813 bytes
 .../res/drawable-hdpi/status_signature_verified.png   | Bin 784 -> 541 bytes
 .../status_signature_verified_cutout.png              | Bin 1017 -> 695 bytes
 .../src/main/res/drawable-mdpi/status_lock_closed.png | Bin 675 -> 528 bytes
 .../src/main/res/drawable-mdpi/status_lock_error.png  | Bin 748 -> 622 bytes
 .../src/main/res/drawable-mdpi/status_lock_open.png   | Bin 675 -> 522 bytes
 .../res/drawable-mdpi/status_signature_expired.png    | Bin 723 -> 601 bytes
 .../drawable-mdpi/status_signature_expired_cutout.png | Bin 789 -> 643 bytes
 .../res/drawable-mdpi/status_signature_invalid.png    | Bin 528 -> 463 bytes
 .../drawable-mdpi/status_signature_invalid_cutout.png | Bin 444 -> 410 bytes
 .../res/drawable-mdpi/status_signature_revoked.png    | Bin 714 -> 613 bytes
 .../drawable-mdpi/status_signature_revoked_cutout.png | Bin 861 -> 685 bytes
 .../res/drawable-mdpi/status_signature_unknown.png    | Bin 640 -> 517 bytes
 .../drawable-mdpi/status_signature_unknown_cutout.png | Bin 740 -> 589 bytes
 .../res/drawable-mdpi/status_signature_unverified.png | Bin 536 -> 469 bytes
 .../status_signature_unverified_cutout.png            | Bin 813 -> 667 bytes
 .../res/drawable-mdpi/status_signature_verified.png   | Bin 541 -> 476 bytes
 .../status_signature_verified_cutout.png              | Bin 695 -> 557 bytes
 .../main/res/drawable-xhdpi/status_lock_closed.png    | Bin 1160 -> 911 bytes
 .../src/main/res/drawable-xhdpi/status_lock_error.png | Bin 1316 -> 1008 bytes
 .../src/main/res/drawable-xhdpi/status_lock_open.png  | Bin 1165 -> 911 bytes
 .../res/drawable-xhdpi/status_signature_expired.png   | Bin 1429 -> 1049 bytes
 .../status_signature_expired_cutout.png               | Bin 1590 -> 1179 bytes
 .../res/drawable-xhdpi/status_signature_invalid.png   | Bin 840 -> 736 bytes
 .../status_signature_invalid_cutout.png               | Bin 694 -> 676 bytes
 .../res/drawable-xhdpi/status_signature_revoked.png   | Bin 1353 -> 1033 bytes
 .../status_signature_revoked_cutout.png               | Bin 1660 -> 1218 bytes
 .../res/drawable-xhdpi/status_signature_unknown.png   | Bin 1231 -> 906 bytes
 .../status_signature_unknown_cutout.png               | Bin 1377 -> 1043 bytes
 .../drawable-xhdpi/status_signature_unverified.png    | Bin 946 -> 706 bytes
 .../status_signature_unverified_cutout.png            | Bin 1555 -> 1166 bytes
 .../res/drawable-xhdpi/status_signature_verified.png  | Bin 1012 -> 784 bytes
 .../status_signature_verified_cutout.png              | Bin 1319 -> 1017 bytes
 .../main/res/drawable-xxhdpi/status_lock_closed.png   | Bin 1740 -> 1160 bytes
 .../main/res/drawable-xxhdpi/status_lock_error.png    | Bin 1919 -> 1316 bytes
 .../src/main/res/drawable-xxhdpi/status_lock_open.png | Bin 1764 -> 1165 bytes
 .../res/drawable-xxhdpi/status_signature_expired.png  | Bin 2075 -> 1429 bytes
 .../status_signature_expired_cutout.png               | Bin 2411 -> 1590 bytes
 .../res/drawable-xxhdpi/status_signature_invalid.png  | Bin 1207 -> 840 bytes
 .../status_signature_invalid_cutout.png               | Bin 958 -> 694 bytes
 .../res/drawable-xxhdpi/status_signature_revoked.png  | Bin 1989 -> 1353 bytes
 .../status_signature_revoked_cutout.png               | Bin 2475 -> 1660 bytes
 .../res/drawable-xxhdpi/status_signature_unknown.png  | Bin 1913 -> 1231 bytes
 .../status_signature_unknown_cutout.png               | Bin 2105 -> 1377 bytes
 .../drawable-xxhdpi/status_signature_unverified.png   | Bin 1413 -> 946 bytes
 .../status_signature_unverified_cutout.png            | Bin 2314 -> 1555 bytes
 .../res/drawable-xxhdpi/status_signature_verified.png | Bin 1584 -> 1012 bytes
 .../status_signature_verified_cutout.png              | Bin 2148 -> 1319 bytes
 60 files changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png
index 7c6bb2d18..a1b090630 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png
index da4a5d89a..e567055aa 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png
index cd02fc1e4..98e32eadc 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png
index f5105c1ae..21e8b536a 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png
index 83f6fde35..84ac9bec2 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png
index 67880d6db..9ae2a09ab 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png
index 29830f5ba..967e00e80 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png
index 2ed67419b..16e1d7181 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png
index 2f7695043..244dd0708 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png
index a6f1f2792..5c3ba866d 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png
index 2ce28c7ca..82cc25a4b 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png
index c25a84b4d..b8b472a5a 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png
index 442c55eee..e752eaeab 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png
index 6f435a85e..d8141b47b 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png
index 160ec7cbe..08a9f464c 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
index a1b090630..cfc39f0e7 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
index e567055aa..824dc2672 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
index 98e32eadc..9bca59ae3 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
index 21e8b536a..81a900147 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
index 84ac9bec2..bc91094b5 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
index 9ae2a09ab..baa78f795 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
index 967e00e80..bc2f56e2a 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
index 16e1d7181..7cf985274 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
index 244dd0708..2d2593194 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
index 5c3ba866d..3d4665320 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
index 82cc25a4b..0fc74d07e 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
index b8b472a5a..8348b32b3 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
index e752eaeab..96a2d1413 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
index d8141b47b..02e53ac8a 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
index 08a9f464c..9f7cf837c 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png
index 5a9664d59..7c6bb2d18 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png
index 608f065af..da4a5d89a 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png
index ee34dd396..cd02fc1e4 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png
index f475c9d84..f5105c1ae 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png
index 33a3efed1..83f6fde35 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png
index f21c2cf52..67880d6db 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png
index bc39d3496..29830f5ba 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png
index be1a1d9dc..2ed67419b 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png
index 58929661f..2f7695043 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png
index 841cfa958..a6f1f2792 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png
index 3020357a4..2ce28c7ca 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png
index 525d1cf6b..c25a84b4d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png
index 3829bb3a0..442c55eee 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png
index 54eee5ba0..6f435a85e 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png
index 3548ee2b6..160ec7cbe 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png
index 4116e13fa..5a9664d59 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png
index 6053b7bec..608f065af 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png
index 67b4ae314..ee34dd396 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png
index 1fec93532..f475c9d84 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png
index df385bb1b..33a3efed1 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png
index fa5a05274..f21c2cf52 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png
index aeb899599..bc39d3496 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png
index a649b39cf..be1a1d9dc 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png
index d77c5e1c1..58929661f 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png
index dba881859..841cfa958 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png
index ee0661234..3020357a4 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png
index 38cf0cebc..525d1cf6b 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png
index 1602747f1..3829bb3a0 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png
index 11ad802fa..54eee5ba0 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png
index 61c23f749..3548ee2b6 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png differ
-- 
cgit v1.2.3


From a3045c710e44a189f3166c5d56b94117a1318731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 28 Jul 2014 09:34:57 +0200
Subject: Use new status icons in key list

---
 OpenKeychain/src/main/res/layout/key_list_item.xml | 30 +++++-----------------
 1 file changed, 6 insertions(+), 24 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 9327c66a5..057902505 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -38,30 +38,12 @@
             android:textAppearance="?android:attr/textAppearanceSmall" />
     </LinearLayout>
 
-    <FrameLayout
-        android:id="@+id/status_layout"
+    <ImageView
         android:layout_width="wrap_content"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/revoked"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/revoked"
-            android:textColor="#e00"
-            android:layout_gravity="center"
-            android:padding="12dp" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/status_image"
-            android:layout_gravity="center"
-            android:src="@drawable/status_signature_verified_cutout"
-            android:padding="16dp" />
-    </FrameLayout>
+        android:layout_height="wrap_content"
+        android:id="@+id/status_image"
+        android:layout_gravity="center"
+        android:src="@drawable/status_signature_verified_cutout"
+        android:padding="16dp" />
 
 </LinearLayout>
-- 
cgit v1.2.3


From 3d6edd11903898b8dc95a52d26b8dc3716d85e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 28 Jul 2014 11:11:23 +0200
Subject: Use icons in key view

---
 OpenKeychain/src/main/res/layout/key_list_item.xml |  2 +-
 .../src/main/res/layout/view_key_activity.xml      | 40 +++++++++++-----------
 OpenKeychain/src/main/res/values/strings.xml       |  4 +++
 3 files changed, 25 insertions(+), 21 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 057902505..8d600464c 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:id="@+id/status_image"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_verified_cutout"
+        android:src="@drawable/status_signature_revoked_cutout"
         android:padding="16dp" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 481b1ddf5..27078c9e4 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -10,36 +10,36 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" />
 
-    <TextView
-        android:layout_width="match_parent"
+    <LinearLayout
+        android:id="@+id/view_key_status_layout"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="This key is expired!"
-        android:id="@+id/view_key_expired"
-        android:textColor="@color/alert"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center_vertical|center_horizontal"
+        android:layout_gravity="center"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:visibility="gone" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="This key has been revoked!"
-        android:id="@+id/view_key_revoked"
-        android:textColor="@color/alert"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center_vertical|center_horizontal"
-        android:visibility="gone"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/view_key_status_image" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/view_key_status_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"/>
+
+    </LinearLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"
         android:visibility="gone"
-        android:id="@+id/status_divider" />
+        android:id="@+id/view_key_status_divider" />
 
     <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
         android:id="@+id/view_key_sliding_tab_layout"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index dd8ae0ac1..f6648ca3d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -492,6 +492,10 @@
     <string name="create_key_upload">Upload key to keyserver</string>
     <string name="create_key_empty">This field is required</string>
 
+    <!-- View key -->
+    <string name="view_key_revoked">This key has been revoked!</string>
+    <string name="view_key_expired">This key is expired!</string>
+
     <!-- Navigation Drawer -->
     <string name="nav_keys">Keys</string>
     <string name="nav_encrypt">Sign and Encrypt</string>
-- 
cgit v1.2.3


From 23689da56db1c4f5e53d6e028a619f357a73586c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 28 Jul 2014 12:24:40 +0200
Subject: Use verified icon for certify action

---
 .../src/main/res/layout/view_key_main_fragment.xml | 51 +++++++++++++++++-----
 1 file changed, 40 insertions(+), 11 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index d93420a99..56441774f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -35,20 +35,49 @@
             android:layout_height="1dip"
             android:background="?android:attr/listDivider" />
 
-        <TextView
+        <!--<TextView-->
+            <!--android:id="@+id/view_key_action_certify"-->
+            <!--android:paddingLeft="8dp"-->
+            <!--android:paddingRight="8dp"-->
+            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="match_parent"-->
+            <!--android:text="@string/key_view_action_certify"-->
+            <!--android:minHeight="?android:attr/listPreferredItemHeight"-->
+            <!--android:drawableRight="@drawable/ic_action_good"-->
+            <!--android:drawablePadding="8dp"-->
+            <!--android:gravity="center_vertical"-->
+            <!--android:clickable="true"-->
+            <!--style="@style/SelectableItem" />-->
+
+        <LinearLayout
             android:id="@+id/view_key_action_certify"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/key_view_action_certify"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_good"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
+            android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem" />
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_action_certify_text"
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_certify"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/view_key_action_certify_image"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/status_signature_verified_cutout"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
 
         <TextView
             style="@style/SectionHeader"
-- 
cgit v1.2.3


From ed6a89f35c21e92108036ec40722c1a3f9d8641c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 28 Jul 2014 16:10:36 +0200
Subject: Use new icons in other key related activites, delete old icons

---
 .../main/res/drawable-hdpi/key_certify_error.png   | Bin 1268 -> 0 bytes
 .../res/drawable-hdpi/key_certify_ok_depth0.png    | Bin 1252 -> 0 bytes
 .../main/res/drawable-hdpi/key_certify_ok_self.png | Bin 898 -> 0 bytes
 .../key_certify_primary_ok_depth0.png              | Bin 900 -> 0 bytes
 .../drawable-hdpi/key_certify_primary_ok_self.png  | Bin 757 -> 0 bytes
 .../main/res/drawable-hdpi/key_certify_revoke.png  | Bin 1278 -> 0 bytes
 .../main/res/drawable-ldpi/key_certify_error.png   | Bin 652 -> 0 bytes
 .../res/drawable-ldpi/key_certify_ok_depth0.png    | Bin 646 -> 0 bytes
 .../main/res/drawable-ldpi/key_certify_ok_self.png | Bin 507 -> 0 bytes
 .../main/res/drawable-ldpi/key_certify_revoke.png  | Bin 663 -> 0 bytes
 .../main/res/drawable-mdpi/key_certify_error.png   | Bin 884 -> 0 bytes
 .../res/drawable-mdpi/key_certify_ok_depth0.png    | Bin 862 -> 0 bytes
 .../main/res/drawable-mdpi/key_certify_ok_self.png | Bin 627 -> 0 bytes
 .../key_certify_primary_ok_depth0.png              | Bin 688 -> 0 bytes
 .../drawable-mdpi/key_certify_primary_ok_self.png  | Bin 555 -> 0 bytes
 .../main/res/drawable-mdpi/key_certify_revoke.png  | Bin 853 -> 0 bytes
 .../main/res/drawable-xhdpi/key_certify_error.png  | Bin 1676 -> 0 bytes
 .../res/drawable-xhdpi/key_certify_ok_depth0.png   | Bin 1606 -> 0 bytes
 .../res/drawable-xhdpi/key_certify_ok_self.png     | Bin 1203 -> 0 bytes
 .../key_certify_primary_ok_depth0.png              | Bin 1091 -> 0 bytes
 .../drawable-xhdpi/key_certify_primary_ok_self.png | Bin 940 -> 0 bytes
 .../main/res/drawable-xhdpi/key_certify_revoke.png | Bin 1646 -> 0 bytes
 .../main/res/drawable-xxhdpi/key_certify_error.png | Bin 2381 -> 0 bytes
 .../res/drawable-xxhdpi/key_certify_ok_depth0.png  | Bin 2364 -> 0 bytes
 .../res/drawable-xxhdpi/key_certify_ok_self.png    | Bin 2217 -> 0 bytes
 .../key_certify_primary_ok_depth0.png              | Bin 1366 -> 0 bytes
 .../key_certify_primary_ok_self.png                | Bin 1282 -> 0 bytes
 .../res/drawable-xxhdpi/key_certify_revoke.png     | Bin 2215 -> 0 bytes
 .../src/main/res/layout/certify_key_activity.xml   |  41 ++++++++++++++-------
 .../src/main/res/layout/view_key_main_fragment.xml |  15 --------
 .../src/main/res/layout/view_key_user_id_item.xml  |   2 +-
 31 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_certify_error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_certify_revoke.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/key_certify_error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/key_certify_revoke.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_certify_error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_certify_revoke.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_certify_error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_certify_revoke.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_error.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_revoke.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_error.png
deleted file mode 100644
index 391d1c988..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_depth0.png
deleted file mode 100644
index 76944469c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_self.png
deleted file mode 100644
index 815701015..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png
deleted file mode 100644
index 026869c14..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png
deleted file mode 100644
index 12d2e026e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_revoke.png
deleted file mode 100644
index c39d3a87c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_revoke.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_error.png
deleted file mode 100644
index 79fddf78a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_depth0.png
deleted file mode 100644
index c400a1820..000000000
Binary files a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_self.png
deleted file mode 100644
index fb1654b53..000000000
Binary files a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_revoke.png
deleted file mode 100644
index 5228a4b6b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_revoke.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_error.png
deleted file mode 100644
index 6def8769f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_depth0.png
deleted file mode 100644
index e16ec810a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_self.png
deleted file mode 100644
index 715a16487..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png
deleted file mode 100644
index c376a2897..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png
deleted file mode 100644
index 45a261b24..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_revoke.png
deleted file mode 100644
index 62ee0ca42..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_revoke.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_error.png
deleted file mode 100644
index 8278ce2b6..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_depth0.png
deleted file mode 100644
index e2aef1177..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_self.png
deleted file mode 100644
index 9bb6ceffa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png
deleted file mode 100644
index de6614246..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png
deleted file mode 100644
index ce10da099..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_revoke.png
deleted file mode 100644
index 1478e726b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_revoke.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_error.png
deleted file mode 100644
index 9416720eb..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_depth0.png
deleted file mode 100644
index 501a75d63..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_self.png
deleted file mode 100644
index 72ada9c1f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png
deleted file mode 100644
index 1b52ef04d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png
deleted file mode 100644
index baa1c00d2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_revoke.png
deleted file mode 100644
index 217f4e914..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_revoke.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 1443ffd46..d9c1b806b 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -106,7 +106,6 @@
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
             android:text="@string/section_uids_to_certify" />
 
@@ -149,21 +148,35 @@
             android:text="@string/section_actions"
             android:layout_weight="1" />
 
-        <TextView
-            android:id="@+id/sign_key_sign_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+        <LinearLayout
+            android:id="@+id/certify_key_certify_button"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/key_view_action_certify"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_good"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
+            android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem" />
+            android:paddingRight="4dp"
+            android:layout_marginBottom="8dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_certify"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/certify_key_action_certify_image"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/status_signature_verified_cutout"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index 56441774f..b11538ba9 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -35,21 +35,6 @@
             android:layout_height="1dip"
             android:background="?android:attr/listDivider" />
 
-        <!--<TextView-->
-            <!--android:id="@+id/view_key_action_certify"-->
-            <!--android:paddingLeft="8dp"-->
-            <!--android:paddingRight="8dp"-->
-            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:text="@string/key_view_action_certify"-->
-            <!--android:minHeight="?android:attr/listPreferredItemHeight"-->
-            <!--android:drawableRight="@drawable/ic_action_good"-->
-            <!--android:drawablePadding="8dp"-->
-            <!--android:gravity="center_vertical"-->
-            <!--android:clickable="true"-->
-            <!--style="@style/SelectableItem" />-->
-
         <LinearLayout
             android:id="@+id/view_key_action_certify"
             android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
index 7de2f9c05..916249b00 100644
--- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
@@ -64,9 +64,9 @@
     </LinearLayout>
 
     <ImageView
+        android:id="@+id/edit_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:id="@+id/edit_image"
         android:src="@drawable/ic_action_edit"
         android:padding="8dp"
         android:layout_gravity="center_horizontal" />
-- 
cgit v1.2.3


From cce243299a400e9d68b9bd350fd75870f51b732f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 28 Jul 2014 16:26:06 +0200
Subject: Fix build by removing old icon reference

---
 OpenKeychain/src/main/res/layout/view_key_user_id_item.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
index 916249b00..157903000 100644
--- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
@@ -24,7 +24,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/certified"
-            android:src="@drawable/key_certify_ok_self"
             android:layout_gravity="center_horizontal" />
 
     </LinearLayout>
-- 
cgit v1.2.3


From 6448de8f6ac84a8dcc91908af37c8826e32aa785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Jul 2014 00:50:53 +0200
Subject: Create key with fragments

---
 .../src/main/res/anim/frag_slide_in_from_left.xml  |   8 ++
 .../src/main/res/anim/frag_slide_in_from_right.xml |   8 ++
 .../src/main/res/anim/frag_slide_out_to_left.xml   |   8 ++
 .../src/main/res/anim/frag_slide_out_to_right.xml  |   8 ++
 .../src/main/res/anim/qr_code_zoom_enter.xml       |  16 +++
 .../src/main/res/anim/qr_code_zoom_exit.xml        |  17 +++
 OpenKeychain/src/main/res/anim/zoom_enter.xml      |  16 ---
 OpenKeychain/src/main/res/anim/zoom_exit.xml       |  17 ---
 .../src/main/res/layout/create_key_activity.xml    |  89 ++------------
 .../main/res/layout/create_key_final_fragment.xml  | 130 +++++++++++++++++++++
 .../main/res/layout/create_key_input_fragment.xml  |  90 ++++++++++++++
 11 files changed, 294 insertions(+), 113 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/anim/frag_slide_in_from_left.xml
 create mode 100644 OpenKeychain/src/main/res/anim/frag_slide_in_from_right.xml
 create mode 100644 OpenKeychain/src/main/res/anim/frag_slide_out_to_left.xml
 create mode 100644 OpenKeychain/src/main/res/anim/frag_slide_out_to_right.xml
 create mode 100644 OpenKeychain/src/main/res/anim/qr_code_zoom_enter.xml
 create mode 100644 OpenKeychain/src/main/res/anim/qr_code_zoom_exit.xml
 delete mode 100644 OpenKeychain/src/main/res/anim/zoom_enter.xml
 delete mode 100644 OpenKeychain/src/main/res/anim/zoom_exit.xml
 create mode 100644 OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/create_key_input_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/anim/frag_slide_in_from_left.xml b/OpenKeychain/src/main/res/anim/frag_slide_in_from_left.xml
new file mode 100644
index 000000000..4a021c676
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/frag_slide_in_from_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set>
+    <translate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXDelta="-100%"
+        android:toXDelta="0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/frag_slide_in_from_right.xml b/OpenKeychain/src/main/res/anim/frag_slide_in_from_right.xml
new file mode 100644
index 000000000..1329f8bef
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/frag_slide_in_from_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set>
+    <translate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXDelta="100%"
+        android:toXDelta="0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/frag_slide_out_to_left.xml b/OpenKeychain/src/main/res/anim/frag_slide_out_to_left.xml
new file mode 100644
index 000000000..4e02af2a4
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/frag_slide_out_to_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set>
+    <translate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXDelta="0"
+        android:toXDelta="-100%"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/frag_slide_out_to_right.xml b/OpenKeychain/src/main/res/anim/frag_slide_out_to_right.xml
new file mode 100644
index 000000000..7b5f63e0d
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/frag_slide_out_to_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set>
+    <translate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromXDelta="0"
+        android:toXDelta="100%"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:duration="500" />
+</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/qr_code_zoom_enter.xml b/OpenKeychain/src/main/res/anim/qr_code_zoom_enter.xml
new file mode 100644
index 000000000..2b95cfba6
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/qr_code_zoom_enter.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
+    <scale
+        android:fromXScale="0.5"
+        android:toXScale="1.0"
+        android:fromYScale="0.5"
+        android:toYScale="1.0"
+        android:pivotX="50%p"
+        android:pivotY="50%p"
+        android:duration="@android:integer/config_mediumAnimTime" />
+    <alpha
+        android:fromAlpha="0"
+        android:toAlpha="1.0"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/qr_code_zoom_exit.xml b/OpenKeychain/src/main/res/anim/qr_code_zoom_exit.xml
new file mode 100644
index 000000000..772375739
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/qr_code_zoom_exit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:zAdjustment="top">
+    <scale
+        android:fromXScale="1.0"
+        android:toXScale="0.5"
+        android:fromYScale="1.0"
+        android:toYScale="0.5"
+        android:pivotX="50%p"
+        android:pivotY="50%p"
+        android:duration="@android:integer/config_mediumAnimTime" />
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/zoom_enter.xml b/OpenKeychain/src/main/res/anim/zoom_enter.xml
deleted file mode 100644
index 2b95cfba6..000000000
--- a/OpenKeychain/src/main/res/anim/zoom_enter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator">
-    <scale
-        android:fromXScale="0.5"
-        android:toXScale="1.0"
-        android:fromYScale="0.5"
-        android:toYScale="1.0"
-        android:pivotX="50%p"
-        android:pivotY="50%p"
-        android:duration="@android:integer/config_mediumAnimTime" />
-    <alpha
-        android:fromAlpha="0"
-        android:toAlpha="1.0"
-        android:duration="@android:integer/config_mediumAnimTime" />
-</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/zoom_exit.xml b/OpenKeychain/src/main/res/anim/zoom_exit.xml
deleted file mode 100644
index 772375739..000000000
--- a/OpenKeychain/src/main/res/anim/zoom_exit.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:zAdjustment="top">
-    <scale
-        android:fromXScale="1.0"
-        android:toXScale="0.5"
-        android:fromYScale="1.0"
-        android:toYScale="0.5"
-        android:pivotX="50%p"
-        android:pivotY="50%p"
-        android:duration="@android:integer/config_mediumAnimTime" />
-    <alpha
-        android:fromAlpha="1.0"
-        android:toAlpha="0"
-        android:duration="@android:integer/config_mediumAnimTime" />
-</set>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 9d56950a8..1e1d0ab9e 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -1,84 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+<?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">
 
-    <LinearLayout
+    <FrameLayout
+        android:id="@+id/create_key_fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:orientation="vertical" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingBottom="8dp"
-            android:text="@string/create_key_text"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <AutoCompleteTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:imeOptions="actionNext"
-            android:inputType="textPersonName"
-            android:hint="@string/label_name"
-            android:ems="10"
-            android:id="@+id/name" />
-
-        <AutoCompleteTextView
-            android:id="@+id/email"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:imeOptions="actionNext"
-            android:hint="@string/label_email"
-            android:ems="10"
-            android:inputType="textEmailAddress" />
-
-        <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:inputType="textPassword"
-            android:hint="@string/label_passphrase"
-            android:ems="10"
-            android:id="@+id/passphrase"
-            android:layout_gravity="center_horizontal" />
-
-        <CheckBox
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:text="@string/create_key_upload"
-            android:id="@+id/create_key_upload" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/create_key_button"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/first_time_create_key"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_new_account"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:clickable="true"
-            style="@style/SelectableItem" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
new file mode 100644
index 000000000..57ba4ea75
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="8dp"
+                android:text="You entered the following credentials:"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
+                android:text="Name"
+                android:textColor="@color/tertiary_text_light"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:layout_marginLeft="8dp"
+                android:text="Max Mustermann"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
+                android:text="Email"
+                android:textColor="@color/tertiary_text_light"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/email"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="max@musterman.com"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_marginBottom="32dp"
+                android:layout_marginLeft="8dp" />
+
+            <CheckBox
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/create_key_upload"
+                android:id="@+id/create_key_upload" />
+
+        </LinearLayout>
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:id="@+id/linearLayout2">
+
+        <TextView
+            android:id="@+id/create_key_back_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="back"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:layout_gravity="center_vertical"/>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/create_key_create_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/title_create_key"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_new_account"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:layout_alignTop="@+id/linearLayout2"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
new file mode 100644
index 000000000..739323019
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="false">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/create_key_text"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <AutoCompleteTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:imeOptions="actionNext"
+                android:inputType="textPersonName"
+                android:hint="@string/label_name"
+                android:ems="10"
+                android:id="@+id/name" />
+
+            <AutoCompleteTextView
+                android:id="@+id/email"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:imeOptions="actionNext"
+                android:hint="@string/label_email"
+                android:ems="10"
+                android:inputType="textEmailAddress" />
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:inputType="textPassword"
+                android:hint="@string/label_passphrase"
+                android:ems="10"
+                android:id="@+id/passphrase"
+                android:layout_gravity="center_horizontal" />
+
+
+        </LinearLayout>
+    </ScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:background="?android:attr/listDivider"
+        android:layout_alignTop="@+id/create_key_button"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <TextView
+        android:id="@+id/create_key_button"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/first_time_create_key"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:drawableRight="@drawable/ic_action_new_account"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 9f9aa79066c48f2d4678c2d13893ea94b194032d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Jul 2014 01:07:10 +0200
Subject: Fix conflicts

---
 .../main/res/layout/create_key_final_fragment.xml  | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 57ba4ea75..4aa7c06b6 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -53,17 +53,38 @@
                 android:layout_height="wrap_content"
                 android:text="max@musterman.com"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_marginBottom="32dp"
+                android:layout_marginBottom="8dp"
                 android:layout_marginLeft="8dp" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
             <CheckBox
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/create_key_upload"
                 android:id="@+id/create_key_upload" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="8dp"
+                android:text="Creating the key can take up to 3 Minutes, be patient!"
+                android:textColor="@color/result_orange"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:id="@+id/textView" />
+
         </LinearLayout>
     </ScrollView>
 
@@ -91,7 +112,7 @@
             android:gravity="center_vertical"
             android:clickable="true"
             style="@style/SelectableItem"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical" />
 
         <View
             android:layout_width="1dp"
-- 
cgit v1.2.3


From cdee62b79d8246ad6b056fc69bcad4c47df53658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Jul 2014 01:13:02 +0200
Subject: Create key: layout above buttons

---
 OpenKeychain/src/main/res/layout/create_key_final_fragment.xml | 8 +++++---
 OpenKeychain/src/main/res/layout/create_key_input_fragment.xml | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 4aa7c06b6..458450653 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -5,7 +5,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_above="@+id/create_key_buttons_divider">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -97,7 +98,7 @@
         android:layout_alignParentStart="true"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:id="@+id/linearLayout2">
+        android:id="@+id/create_key_buttons">
 
         <TextView
             android:id="@+id/create_key_back_button"
@@ -140,10 +141,11 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/create_key_buttons_divider"
         android:layout_width="match_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"
-        android:layout_alignTop="@+id/linearLayout2"
+        android:layout_alignTop="@+id/create_key_buttons"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_alignParentLeft="true"
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index 739323019..862eeb48f 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -6,7 +6,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="false">
+        android:fillViewport="false"
+        android:layout_above="@+id/create_key_button_divider">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -58,6 +59,7 @@
     </ScrollView>
 
     <View
+        android:id="@+id/create_key_button_divider"
         android:layout_width="match_parent"
         android:layout_height="1dip"
         android:layout_marginLeft="16dp"
-- 
cgit v1.2.3


From e46d72ba27d7ac5d54b8c35c3e353c9f7c5b52c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Jul 2014 14:59:12 +0200
Subject: Fix drawer in key list

---
 OpenKeychain/src/main/res/layout/key_list_activity.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml
index 6c9bed872..297fc526e 100644
--- a/OpenKeychain/src/main/res/layout/key_list_activity.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml
@@ -9,12 +9,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/notify_area"/>
+        <include layout="@layout/notify_area" />
 
-        <include layout="@layout/key_list_content"/>
-
-        <include layout="@layout/drawer_list" />
+        <include layout="@layout/key_list_content" />
 
     </LinearLayout>
 
+    <include layout="@layout/drawer_list" />
+
 </android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 052cdfa392f4d6377903b5a982e6acb74bc6433a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Jul 2014 15:19:33 +0200
Subject: Create key: upload

---
 OpenKeychain/src/main/res/layout/create_key_activity.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 1e1d0ab9e..0bd053c49 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -4,6 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <include layout="@layout/notify_area" />
+
     <FrameLayout
         android:id="@+id/create_key_fragment_container"
         android:layout_width="match_parent"
-- 
cgit v1.2.3


From fcc535a57381009b173bbe455e67e6825be6b684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Jul 2014 15:29:01 +0200
Subject: Create key: repeat passphrase

---
 .../src/main/res/layout/create_key_final_fragment.xml         |  2 +-
 .../src/main/res/layout/create_key_input_fragment.xml         | 11 ++++++++++-
 OpenKeychain/src/main/res/values/strings.xml                  |  5 +++--
 3 files changed, 14 insertions(+), 4 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 458450653..ddfbb325f 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -82,7 +82,7 @@
                 android:paddingTop="16dp"
                 android:paddingBottom="8dp"
                 android:text="Creating the key can take up to 3 Minutes, be patient!"
-                android:textColor="@color/result_orange"
+                android:textColor="@color/result_red"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:id="@+id/textView" />
 
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index 862eeb48f..ccc2f2bdd 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -45,15 +45,24 @@
                 android:inputType="textEmailAddress" />
 
             <EditText
+                android:id="@+id/passphrase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
                 android:inputType="textPassword"
                 android:hint="@string/label_passphrase"
                 android:ems="10"
-                android:id="@+id/passphrase"
                 android:layout_gravity="center_horizontal" />
 
+            <EditText
+                android:id="@+id/passphrase_again"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:inputType="textPassword"
+                android:hint="@string/label_passphrase_again"
+                android:ems="10"
+                android:layout_gravity="center_horizontal" />
 
         </LinearLayout>
     </ScrollView>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3a5e77d38..e9a7e98dd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -106,7 +106,7 @@
     <string name="label_file">File</string>
     <string name="label_no_passphrase">No Passphrase</string>
     <string name="label_passphrase">Passphrase</string>
-    <string name="label_passphrase_again">Again</string>
+    <string name="label_passphrase_again">Repeat Passphrase</string>
     <string name="label_algorithm">Algorithm</string>
     <string name="label_ascii_armor">ASCII Armor</string>
     <string name="label_conceal_pgp_application">Let others know that you\'re using OpenKeychain</string>
@@ -488,9 +488,10 @@
     </string-array>
 
     <!-- Create key -->
-    <string name="create_key_text">Enter Full Name, Email and Passphrase!</string>
+    <string name="create_key_text">Enter Full Name, Email and a Passphrase.</string>
     <string name="create_key_upload">Upload key to keyserver</string>
     <string name="create_key_empty">This field is required</string>
+    <string name="create_key_passphrases_not_equal">Passphrases are not equal</string>
 
     <!-- View key -->
     <string name="view_key_revoked">This key has been revoked!</string>
-- 
cgit v1.2.3


From 64aac8023ef9c9b08d17346e41d06a667480a118 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 30 Jul 2014 16:22:55 +0200
Subject: couple of fixes in save*KeyRing methods

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e9a7e98dd..6fa90b31a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -580,6 +580,7 @@
     <string name="msg_ip_uid_processing">Processing user id %s</string>
     <string name="msg_ip_uid_revoked">User id is revoked</string>
     <string name="msg_is_bad_type_public">Tried to import public keyring as secret. This is a bug, please file a report!</string>
+    <string name="msg_is_bad_type_uncanon">Tried to import a keyring without canonicalization. This is a bug, please file a report!</string>
 
     <!-- Import Secret log entries -->
     <string name="msg_is">Importing secret key %s</string>
-- 
cgit v1.2.3


From 65488cbf05b0c90ac84d9b1895c68455217e3f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 30 Jul 2014 17:47:17 +0200
Subject: Create key: work on upload

---
 .../src/main/res/layout/certify_key_activity.xml   | 328 +++++++++++----------
 .../main/res/layout/create_key_input_fragment.xml  |  60 +++-
 .../src/main/res/layout/first_time_activity.xml    |  13 +-
 3 files changed, 219 insertions(+), 182 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index d9c1b806b..11bc70331 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -1,183 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical">
+    <include layout="@layout/notify_area" />
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_certification_key" />
+    <ScrollView xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
 
-        <fragment
-            android:id="@+id/sign_key_select_key_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            tools:layout="@layout/select_secret_key_layout_fragment" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_key_to_certify" />
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
 
-        <TableLayout
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_marginLeft="8dp"
-            android:shrinkColumns="1">
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_key_id" />
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_certification_key" />
+
+            <fragment
+                android:id="@+id/sign_key_select_key_fragment"
+                android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="4dp"
+                tools:layout="@layout/select_secret_key_layout_fragment" />
 
-                <TextView
-                    android:id="@+id/key_id"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text=""
-                    android:typeface="monospace" />
-            </TableRow>
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_key_to_certify" />
 
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
+            <TableLayout
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:layout_marginLeft="8dp"
+                android:shrinkColumns="1">
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_key_id" />
+
+                    <TextView
+                        android:id="@+id/key_id"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip"
+                        android:text=""
+                        android:typeface="monospace" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_main_user_id" />
+
+                    <TextView
+                        android:id="@+id/main_user_id"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_fingerprint" />
+
+                    <TextView
+                        android:id="@+id/view_key_fingerprint"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:typeface="monospace" />
+
+                </TableRow>
+
+            </TableLayout>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_main_user_id" />
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_uids_to_certify" />
 
-                <TextView
-                    android:id="@+id/main_user_id"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+            <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                android:id="@+id/view_key_user_ids"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:descendantFocusability="blocksDescendants" />
 
-            </TableRow>
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_upload_key" />
+
+            <CheckBox
+                android:id="@+id/sign_key_upload_checkbox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="4dp"
+                android:checked="false"
+                android:text="@string/label_send_key" />
+
+            <Spinner
+                android:id="@+id/upload_key_keyserver"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="4dp"
+                android:enabled="false" />
 
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_actions"
+                android:layout_weight="1" />
+
+            <LinearLayout
+                android:id="@+id/certify_key_certify_button"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/listPreferredItemHeight"
+                android:clickable="true"
+                android:paddingRight="4dp"
+                android:layout_marginBottom="8dp"
+                style="@style/SelectableItem"
+                android:orientation="horizontal">
 
                 <TextView
+                    android:paddingLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:text="@string/key_view_action_certify"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical" />
+
+                <ImageView
+                    android:id="@+id/certify_key_action_certify_image"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_fingerprint" />
+                    android:layout_height="match_parent"
+                    android:padding="8dp"
+                    android:src="@drawable/status_signature_verified_cutout"
+                    android:layout_gravity="center_vertical" />
 
-                <TextView
-                    android:id="@+id/view_key_fingerprint"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:typeface="monospace" />
-
-            </TableRow>
-
-        </TableLayout>
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_uids_to_certify" />
-
-        <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/view_key_user_ids"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:descendantFocusability="blocksDescendants" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_upload_key" />
-
-        <CheckBox
-            android:id="@+id/sign_key_upload_checkbox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:checked="false"
-            android:text="@string/label_send_key" />
-
-        <Spinner
-            android:id="@+id/upload_key_keyserver"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:enabled="false" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_actions"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/certify_key_certify_button"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            android:layout_marginBottom="8dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_certify"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
+            </LinearLayout>
 
-            <ImageView
-                android:id="@+id/certify_key_action_certify_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout"
-                android:layout_gravity="center_vertical" />
 
         </LinearLayout>
 
+    </ScrollView>
 
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index ccc2f2bdd..30ccc05ab 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -74,28 +74,56 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:background="?android:attr/listDivider"
-        android:layout_alignTop="@+id/create_key_button"
+        android:layout_alignTop="@+id/create_key_buttons"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true" />
 
-    <TextView
-        android:id="@+id/create_key_button"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/first_time_create_key"
-        android:minHeight="?android:attr/listPreferredItemHeight"
-        android:drawableRight="@drawable/ic_action_new_account"
-        android:drawablePadding="8dp"
-        android:gravity="center_vertical"
-        android:clickable="true"
-        style="@style/SelectableItem"
+        android:orientation="horizontal"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:id="@+id/create_key_buttons">
 
+        <TextView
+            android:id="@+id/create_key_back_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text=""
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/create_key_button"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/title_create_key"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_action_new_account"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index e1a67a077..fad1a3b26 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -24,16 +24,16 @@
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/first_time_create_key"
+                android:id="@+id/first_time_import_key"
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/first_time_create_key"
+                android:text="@string/first_time_import_key"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_new_account"
+                android:drawableRight="@drawable/ic_action_download"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:clickable="true"
@@ -47,20 +47,21 @@
                 android:background="?android:attr/listDivider" />
 
             <TextView
-                android:id="@+id/first_time_import_key"
+                android:id="@+id/first_time_create_key"
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/first_time_import_key"
+                android:text="@string/first_time_create_key"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_download"
+                android:drawableRight="@drawable/ic_action_new_account"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:clickable="true"
                 style="@style/SelectableItem" />
+
         </LinearLayout>
 
         <View
-- 
cgit v1.2.3


From 9475285013accafd24d5bc14da9ba01ca218cbe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 17:11:06 +0200
Subject: Better exception handling for import of keys

---
 OpenKeychain/src/main/res/values-es/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-fr/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-it/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-ja/strings.xml | 2 +-
 OpenKeychain/src/main/res/values-ru/strings.xml | 2 +-
 OpenKeychain/src/main/res/values/strings.xml    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 002243482..72af24255 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -253,7 +253,7 @@
   <string name="error_keyserver_insufficient_query">Petición de búsqueda de clave demasiado corta</string>
   <string name="error_searching_keys">Error irrecuperable buscando claves en el servidor</string>
   <string name="error_keyserver_too_many_responses">La petición de búsqueda de clave devolvió demasiados candidatos; por favor refine su petición</string>
-  <string name="error_import_file_no_content">El Fichero/Portapapeles está vacío</string>
+  <string name="error_import_no_valid_keys">El Fichero/Portapapeles está vacío</string>
   <string name="error_generic_report_bug">Ha ocurrido un error genérico, por favor, informa de este bug a OpenKeychain</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">parte del archivo cargado es un objeto OpenPGP válido pero no una clave OpenPGP</item>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index a3030a65e..a4eb177e8 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -253,7 +253,7 @@
   <string name="error_keyserver_insufficient_query">La requête de recherche de clef est trop courte</string>
   <string name="error_searching_keys">Erreur irrécupérable lors de la recherche de clef sur le serveur</string>
   <string name="error_keyserver_too_many_responses">La requête de recherche de clef a retourné trop de candidats. Veuillez raffiner la requête</string>
-  <string name="error_import_file_no_content">Le fichier/le presse-papiers est vide</string>
+  <string name="error_import_no_valid_keys">Le fichier/le presse-papiers est vide</string>
   <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">une partie du fichier chargé est un objet OpenPGP valide mais pas une clef OpenPGP</item>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 476b7fb31..6debc0418 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -253,7 +253,7 @@
   <string name="error_keyserver_insufficient_query">Chiave della query di ricerca troppo corta</string>
   <string name="error_searching_keys">Errore irreversibile nella ricerca di chiavi sul server</string>
   <string name="error_keyserver_too_many_responses">Chiave della query di ricerca ha generato troppi candidati; Si prega di perfezionare la ricerca</string>
-  <string name="error_import_file_no_content">File/Appunti vuoti</string>
+  <string name="error_import_no_valid_keys">File/Appunti vuoti</string>
   <string name="error_generic_report_bug">Si è verificato un errore generico, si prega di creare una nuova segnalazione di errore per OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">parte del file caricato e\' un oggetto OpenPGP valido, ma non una chave OpenPGP</item>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index db1150102..7d12af22e 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -249,7 +249,7 @@
   <string name="error_keyserver_insufficient_query">鍵検索のクエリが短かすぎます</string>
   <string name="error_searching_keys">サーバでの鍵の検索が回復不可能なエラーになりました</string>
   <string name="error_keyserver_too_many_responses">鍵検索のクエリが沢山の候補を返しました; クエリを精密化してください</string>
-  <string name="error_import_file_no_content">ファイル/クリップボードが空です</string>
+  <string name="error_import_no_valid_keys">ファイル/クリップボードが空です</string>
   <string name="error_generic_report_bug">一般エラーが発生しました、この新しいバグの情報をOpenKeychainプロジェクトに送ってください</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="other">読み込んだファイルのOpenPGPオブジェクト部分は正しいですが、OpenPGPの鍵ではありません</item>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index d15e35f50..465e9bb8c 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -257,7 +257,7 @@
   <string name="error_keyserver_insufficient_query">Запрос слишком короткий</string>
   <string name="error_searching_keys">Ошибка поиска ключей на сервере</string>
   <string name="error_keyserver_too_many_responses">Поиск ключа вернул слишком много вариантов; Пожалуйста, уточните запрос</string>
-  <string name="error_import_file_no_content">Файл/Буфер пуст</string>
+  <string name="error_import_no_valid_keys">Файл/Буфер пуст</string>
   <string name="error_generic_report_bug">Выявлена ошибка. Пожалуйста, сообщите о ней разработчику.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">часть загруженного файла содержит данные OpenPGP, но это не ключ</item>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6fa90b31a..37132237a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -273,7 +273,7 @@
     <string name="error_keyserver_insufficient_query">Key search query too short</string>
     <string name="error_searching_keys">Unrecoverable error searching for keys at server</string>
     <string name="error_keyserver_too_many_responses">Key search query returned too many candidates; Please refine query</string>
-    <string name="error_import_file_no_content">File/Clipboard is empty</string>
+    <string name="error_import_no_valid_keys">No valid keys found in File/Clipboard!</string>
     <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string>
     <plurals name="error_import_non_pgp_part">
         <item quantity="one">part of the loaded file is a valid OpenPGP object but not a OpenPGP key</item>
-- 
cgit v1.2.3


From cc034a09139ba12e70baba5d8eb45aeb1318097b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 17:56:47 +0200
Subject: Exception handling with keyserver queries

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 37132237a..72d167233 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -271,7 +271,7 @@
     <string name="error_nfc_needed">NFC is not available on your device!</string>
     <string name="error_nothing_import">No keys found!</string>
     <string name="error_keyserver_insufficient_query">Key search query too short</string>
-    <string name="error_searching_keys">Unrecoverable error searching for keys at server</string>
+    <string name="error_searching_keys">An error occurred when searching for keys</string>
     <string name="error_keyserver_too_many_responses">Key search query returned too many candidates; Please refine query</string>
     <string name="error_import_no_valid_keys">No valid keys found in File/Clipboard!</string>
     <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string>
-- 
cgit v1.2.3


From b052d5e89cb323f528d568373605adaab03cb4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 18:42:54 +0200
Subject: Smaller notes

---
 OpenKeychain/src/main/res/layout/create_key_final_fragment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index ddfbb325f..cc152a323 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="16dp"
                 android:paddingBottom="8dp"
-                android:text="Creating the key can take up to 3 Minutes, be patient!"
+                android:text="Creating the key can take up to 3 Minutes, be patient!\n(3 subkeys, RSA, 4096 bit)"
                 android:textColor="@color/result_red"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:id="@+id/textView" />
-- 
cgit v1.2.3


From 80f9c769c05485c517036e602a8c83901c63e733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 19:05:09 +0200
Subject: Keyserver exception translateable

---
 OpenKeychain/src/main/res/values-de/strings.xml |  4 ++--
 OpenKeychain/src/main/res/values-es/strings.xml |  4 ++--
 OpenKeychain/src/main/res/values-fr/strings.xml |  4 ++--
 OpenKeychain/src/main/res/values-it/strings.xml |  4 ++--
 OpenKeychain/src/main/res/values-ja/strings.xml |  4 ++--
 OpenKeychain/src/main/res/values-ru/strings.xml |  4 ++--
 OpenKeychain/src/main/res/values-sl/strings.xml |  4 ++--
 OpenKeychain/src/main/res/values-uk/strings.xml |  4 ++--
 OpenKeychain/src/main/res/values/strings.xml    | 12 +++++++-----
 9 files changed, 23 insertions(+), 21 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index de6962dc9..9d9868457 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -247,8 +247,8 @@
   <string name="error_only_files_are_supported">Binäre Daten ohne ohne Datei im Dateisystem werden nicht unterstützt.</string>
   <string name="error_jelly_bean_needed">Android 4.1 wird benötigt um Androids NFC Beam nutzen zu können!</string>
   <string name="error_nfc_needed">NFC steht auf diesem Gerät nicht zur Verfügung!</string>
-  <string name="error_keyserver_insufficient_query">zu kurze Schlüsselanfrage</string>
-  <string name="error_keyserver_too_many_responses">Die Schlüsselanfrage liefert zu viele Ergebnisse. Bitte verfeinern sie sie Anfrage.</string>
+  <string name="error_query_too_short">zu kurze Schlüsselanfrage</string>
+  <string name="error_too_many_responses">Die Schlüsselanfrage liefert zu viele Ergebnisse. Bitte verfeinern sie sie Anfrage.</string>
   <string name="error_generic_report_bug">Ein allgemeiner Fehler trat auf, bitte schreiben Sie einen neuen Bugreport für OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">Ein Teil der geladenen Datei ist ein gültiges OpenPGP Objekt aber kein OpenPGP Schlüssel</item>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 72af24255..719ddf414 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -250,9 +250,9 @@
   <string name="error_jelly_bean_needed">¡Necesita Android 4.1 para usar la característica NFC Beam (haz NFC) de Android!</string>
   <string name="error_nfc_needed">¡NFC no está disponible en tu dispositivo!</string>
   <string name="error_nothing_import">¡No se encontraron claves!</string>
-  <string name="error_keyserver_insufficient_query">Petición de búsqueda de clave demasiado corta</string>
+  <string name="error_query_too_short">Petición de búsqueda de clave demasiado corta</string>
   <string name="error_searching_keys">Error irrecuperable buscando claves en el servidor</string>
-  <string name="error_keyserver_too_many_responses">La petición de búsqueda de clave devolvió demasiados candidatos; por favor refine su petición</string>
+  <string name="error_too_many_responses">La petición de búsqueda de clave devolvió demasiados candidatos; por favor refine su petición</string>
   <string name="error_import_no_valid_keys">El Fichero/Portapapeles está vacío</string>
   <string name="error_generic_report_bug">Ha ocurrido un error genérico, por favor, informa de este bug a OpenKeychain</string>
   <plurals name="error_import_non_pgp_part">
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index a4eb177e8..0c5c5de67 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -250,9 +250,9 @@
   <string name="error_jelly_bean_needed">Il vous faut Android 4.1 pour utiliser la fonction Beam NFC d\'Android !</string>
   <string name="error_nfc_needed">La NFC n\'est pas disponible sur votre appareil !</string>
   <string name="error_nothing_import">Aucune clef trouvée !</string>
-  <string name="error_keyserver_insufficient_query">La requête de recherche de clef est trop courte</string>
+  <string name="error_query_too_short">La requête de recherche de clef est trop courte</string>
   <string name="error_searching_keys">Erreur irrécupérable lors de la recherche de clef sur le serveur</string>
-  <string name="error_keyserver_too_many_responses">La requête de recherche de clef a retourné trop de candidats. Veuillez raffiner la requête</string>
+  <string name="error_too_many_responses">La requête de recherche de clef a retourné trop de candidats. Veuillez raffiner la requête</string>
   <string name="error_import_no_valid_keys">Le fichier/le presse-papiers est vide</string>
   <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 6debc0418..074efb78b 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -250,9 +250,9 @@
   <string name="error_jelly_bean_needed">Devi avere Android 4.1 per usare Android NFC Beam!</string>
   <string name="error_nfc_needed">NFC non disponibile nel tuo dispositivo!</string>
   <string name="error_nothing_import">Nessuna chiave trovata!</string>
-  <string name="error_keyserver_insufficient_query">Chiave della query di ricerca troppo corta</string>
+  <string name="error_query_too_short">Chiave della query di ricerca troppo corta</string>
   <string name="error_searching_keys">Errore irreversibile nella ricerca di chiavi sul server</string>
-  <string name="error_keyserver_too_many_responses">Chiave della query di ricerca ha generato troppi candidati; Si prega di perfezionare la ricerca</string>
+  <string name="error_too_many_responses">Chiave della query di ricerca ha generato troppi candidati; Si prega di perfezionare la ricerca</string>
   <string name="error_import_no_valid_keys">File/Appunti vuoti</string>
   <string name="error_generic_report_bug">Si è verificato un errore generico, si prega di creare una nuova segnalazione di errore per OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 7d12af22e..070ee7f5a 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -246,9 +246,9 @@
   <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1  が必要です!</string>
   <string name="error_nfc_needed">あなたのデバイスにはNFCが存在しません!</string>
   <string name="error_nothing_import">鍵が見当りません!</string>
-  <string name="error_keyserver_insufficient_query">鍵検索のクエリが短かすぎます</string>
+  <string name="error_query_too_short">鍵検索のクエリが短かすぎます</string>
   <string name="error_searching_keys">サーバでの鍵の検索が回復不可能なエラーになりました</string>
-  <string name="error_keyserver_too_many_responses">鍵検索のクエリが沢山の候補を返しました; クエリを精密化してください</string>
+  <string name="error_too_many_responses">鍵検索のクエリが沢山の候補を返しました; クエリを精密化してください</string>
   <string name="error_import_no_valid_keys">ファイル/クリップボードが空です</string>
   <string name="error_generic_report_bug">一般エラーが発生しました、この新しいバグの情報をOpenKeychainプロジェクトに送ってください</string>
   <plurals name="error_import_non_pgp_part">
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 465e9bb8c..1e697c8db 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -254,9 +254,9 @@
   <string name="error_jelly_bean_needed">Для использования NFC Beam требуется Android 4.1+ !</string>
   <string name="error_nfc_needed">Ваше устройство не поддерживает NFC!</string>
   <string name="error_nothing_import">Ключи не найдены!</string>
-  <string name="error_keyserver_insufficient_query">Запрос слишком короткий</string>
+  <string name="error_query_too_short">Запрос слишком короткий</string>
   <string name="error_searching_keys">Ошибка поиска ключей на сервере</string>
-  <string name="error_keyserver_too_many_responses">Поиск ключа вернул слишком много вариантов; Пожалуйста, уточните запрос</string>
+  <string name="error_too_many_responses">Поиск ключа вернул слишком много вариантов; Пожалуйста, уточните запрос</string>
   <string name="error_import_no_valid_keys">Файл/Буфер пуст</string>
   <string name="error_generic_report_bug">Выявлена ошибка. Пожалуйста, сообщите о ней разработчику.</string>
   <plurals name="error_import_non_pgp_part">
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 61fe6ed86..b9a0c4cb9 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -254,9 +254,9 @@
   <string name="error_only_files_are_supported">Neposredni binarni podatki brez dejanske datoteke v datotečnem sistemu niso podprti.</string>
   <string name="error_jelly_bean_needed">Za uporabo storitve NFC Beam potrebujete najmanj Android 4.1!</string>
   <string name="error_nfc_needed">NFC ni na voljo na vaši napravi!</string>
-  <string name="error_keyserver_insufficient_query">Iskalni pojem je prekratek</string>
+  <string name="error_query_too_short">Iskalni pojem je prekratek</string>
   <string name="error_searching_keys">Nepremostljiva napaka pri iskanju ključev na strežniku</string>
-  <string name="error_keyserver_too_many_responses">Iskanje ključev je vrnilo preveč zadetkov; prosimo redefinirajte iskalni pojem</string>
+  <string name="error_too_many_responses">Iskanje ključev je vrnilo preveč zadetkov; prosimo redefinirajte iskalni pojem</string>
   <string name="error_generic_report_bug">Pripetila se je splošna napaka, prosimo ustvarite poročilo o \'hrošču\'.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">Del naložene datoteke je veljavnen objekt OpenPGP a ni ključ.</item>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 90ad799a5..4e267e431 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -252,9 +252,9 @@
   <string name="error_jelly_bean_needed">Вам потрібний Android 4.1 для використання функції Androids NFC промінь!</string>
   <string name="error_nfc_needed">NFC недоступний на вашому пристрої!</string>
   <string name="error_nothing_import">Ключ не знайдено!</string>
-  <string name="error_keyserver_insufficient_query">Запит пошуку ключа надто короткий</string>
+  <string name="error_query_too_short">Запит пошуку ключа надто короткий</string>
   <string name="error_searching_keys">Невиправна помилка пошуку ключів в сервері</string>
-  <string name="error_keyserver_too_many_responses">Запит пошуку ключа видав надто багато варіантів. Уточніть пошуковий запит</string>
+  <string name="error_too_many_responses">Запит пошуку ключа видав надто багато варіантів. Уточніть пошуковий запит</string>
   <string name="error_generic_report_bug">Трапилася загальна помилка, будь ласка, створіть новий звіт про помилку для OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">частина завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 72d167233..aca8f3a88 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -270,9 +270,11 @@
     <string name="error_jelly_bean_needed">You need Android 4.1 to use Android\'s NFC Beam feature!</string>
     <string name="error_nfc_needed">NFC is not available on your device!</string>
     <string name="error_nothing_import">No keys found!</string>
-    <string name="error_keyserver_insufficient_query">Key search query too short</string>
-    <string name="error_searching_keys">An error occurred when searching for keys</string>
-    <string name="error_keyserver_too_many_responses">Key search query returned too many candidates; Please refine query</string>
+    <string name="error_query_too_short">Search query too short. Please refine your query!</string>
+    <string name="error_searching_keys">An error occurred when searching for keys.</string>
+    <string name="error_too_many_responses">Key search query returned too many candidates. Please refine your query!</string>
+    <string name="error_too_short_or_too_many_responses">Either no keys or too many have been found. Please improve your query!</string>
+
     <string name="error_import_no_valid_keys">No valid keys found in File/Clipboard!</string>
     <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string>
     <plurals name="error_import_non_pgp_part">
@@ -392,8 +394,8 @@
         <item quantity="other">Successfully imported %1$d keys</item>
     </plurals>
     <plurals name="import_keys_added_and_updated_2">
-        <item quantity="one"> and updated key%2$s.</item>
-        <item quantity="other"> and updated %1$d keys%2$s.</item>
+        <item quantity="one">and updated key%2$s.</item>
+        <item quantity="other">and updated %1$d keys%2$s.</item>
     </plurals>
     <plurals name="import_keys_added">
         <item quantity="one">Successfully imported key%2$s.</item>
-- 
cgit v1.2.3


From 258bd3a44f88b58be1d38545c9b30c55c72c8070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 19:06:30 +0200
Subject: Fix string

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index aca8f3a88..c5cba1311 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -493,7 +493,7 @@
     <string name="create_key_text">Enter Full Name, Email and a Passphrase.</string>
     <string name="create_key_upload">Upload key to keyserver</string>
     <string name="create_key_empty">This field is required</string>
-    <string name="create_key_passphrases_not_equal">Passphrases are not equal</string>
+    <string name="create_key_passphrases_not_equal">Passphrases do not match</string>
 
     <!-- View key -->
     <string name="view_key_revoked">This key has been revoked!</string>
-- 
cgit v1.2.3


From 58c2ca6eb814fa5384a7342b249fdb48b52af07d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 31 Jul 2014 20:59:40 +0200
Subject: completely overengineer progress indication in
 {modify,create}SecretKeyRing methods

---
 OpenKeychain/src/main/res/values/strings.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index c5cba1311..0cffdd28a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -304,6 +304,20 @@
     <string name="progress_building_master_key">building master ring…</string>
     <string name="progress_adding_sub_keys">adding sub keys…</string>
     <string name="progress_saving_key_ring">saving key…</string>
+    <string name="progress_generating_rsa">generating new RSA key…</string>
+    <string name="progress_generating_dsa">generating new DSA key…</string>
+    <string name="progress_generating_elgamal">generating new ElGamal key…</string>
+
+    <string name="progress_modify">modifying keyring…</string>
+
+    <string name="progress_modify_unlock">unlocking keyring…</string>
+    <string name="progress_modify_adduid">adding user ids…</string>
+    <string name="progress_modify_revokeuid">revoking user ids…</string>
+    <string name="progress_modify_primaryuid">changing primary user id…</string>
+    <string name="progress_modify_subkeychange">modifying subkeys…</string>
+    <string name="progress_modify_subkeyrevoke">revoking subkeys…</string>
+    <string name="progress_modify_subkeyadd">adding subkeys…</string>
+    <string name="progress_modify_passphrase">changing passphrase…</string>
 
     <plurals name="progress_exporting_key">
         <item quantity="one">exporting key…</item>
-- 
cgit v1.2.3


From 138d5a1d9c1bd4b0fa607c8fbbbed988670bd7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 21:18:24 +0200
Subject: Robots like coffee too...

---
 .../main/res/drawable-hdpi/create_key_robot.png    | Bin 0 -> 2259 bytes
 .../main/res/drawable-mdpi/create_key_robot.png    | Bin 0 -> 1766 bytes
 .../main/res/drawable-xhdpi/create_key_robot.png   | Bin 0 -> 3176 bytes
 .../main/res/drawable-xxhdpi/create_key_robot.png  | Bin 0 -> 4039 bytes
 .../main/res/layout/create_key_final_fragment.xml  |  31 +++++++++++++++------
 .../src/main/res/layout/decrypt_result_include.xml |   2 +-
 .../main/res/layout/edit_key_subkey_added_item.xml |   2 +-
 .../res/layout/edit_key_user_id_added_item.xml     |   2 +-
 OpenKeychain/src/main/res/values/colors.xml        |  14 +++++++---
 9 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png
new file mode 100644
index 000000000..acc198fc3
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png
new file mode 100644
index 000000000..58476bfc9
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png
new file mode 100644
index 000000000..022f2dd2e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png
new file mode 100644
index 000000000..5392deafd
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index cc152a323..74231142a 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -76,15 +76,30 @@
                 android:layout_height="1dip"
                 android:background="?android:attr/listDivider" />
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="16dp"
-                android:paddingBottom="8dp"
-                android:text="Creating the key can take up to 3 Minutes, be patient!\n(3 subkeys, RSA, 4096 bit)"
-                android:textColor="@color/result_red"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:id="@+id/textView" />
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/imageView"
+                    android:src="@drawable/create_key_robot"
+                    android:layout_gravity="center_vertical" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:text="Creating a key may take a while, have a cup of coffee in the meantime…\n(3 subkeys, RSA, 4096 bit)"
+                    android:textColor="@color/android_green_dark"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:id="@+id/textView" />
+
+            </LinearLayout>
 
         </LinearLayout>
     </ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 05877656b..fcad91df3 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -8,7 +8,7 @@
     android:paddingRight="16dp"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
-    android:background="@color/result_purple">
+    android:background="@color/android_purple_light">
 
     <View
         android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml
index 856bef36a..a4258b998 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:minWidth="10dp"
-        android:background="@color/result_green" />
+        android:background="@color/android_green_light" />
 
     <TableLayout
         android:layout_width="0dp"
diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml
index e69452db1..ef0e2626e 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:minWidth="10dp"
-        android:background="@color/result_green" />
+        android:background="@color/android_green_light" />
 
     <LinearLayout
         android:orientation="vertical"
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 449a09003..a21f949d1 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -10,8 +10,14 @@
     <color name="holo_gray_light">#33999999</color>
     <color name="holo_gray_bright">#33CCCCCC</color>
 
-    <color name="result_red">#ffff4444</color>
-    <color name="result_orange">#ffffbb33</color>
-    <color name="result_green">#ff99cc00</color>
-    <color name="result_purple">#aa66cc</color>
+    <!-- http://developer.android.com/design/style/color.html -->
+    <color name="android_red_light">#ffff4444</color>
+    <color name="android_red_dark">#ffCC0000</color>
+    <color name="android_orange_light">#ffffbb33</color>
+    <color name="android_orange_dark">#ffFF8800</color>
+    <color name="android_green_light">#ff99cc00</color>
+    <color name="android_green_dark">#ff669900</color>
+    <color name="android_purple_light">#ffaa66cc</color>
+    <color name="android_purple_dark">#ff9933CC</color>
+
 </resources>
-- 
cgit v1.2.3


From b9694ae9c58eaf5cbd723edc35d38ba2bc00eccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 21:29:45 +0200
Subject: Add notify layouts to some activities

---
 .../res/layout/api_account_settings_activity.xml   |  30 +++---
 .../main/res/layout/api_app_settings_activity.xml  |  50 +++++-----
 .../src/main/res/layout/certify_key_activity.xml   |   3 +-
 .../src/main/res/layout/upload_key_activity.xml    | 101 +++++++++++----------
 4 files changed, 104 insertions(+), 80 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
index 3557c1f00..b2a9c11f5 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
+    <include layout="@layout/notify_area" />
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <fragment
-            android:id="@+id/api_account_settings_fragment"
-            android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:orientation="vertical">
+
+            <fragment
+                android:id="@+id/api_account_settings_fragment"
+                android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-    </LinearLayout>
-</ScrollView>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index 49c4ccbfe..1c09820a9 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -1,33 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
+    <include layout="@layout/notify_area" />
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <fragment
-            android:id="@+id/api_app_settings_fragment"
-            android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:layout="@layout/api_app_settings_fragment" />
+            android:padding="16dp"
+            android:orientation="vertical">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/api_settings_accounts"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            <fragment
+                android:id="@+id/api_app_settings_fragment"
+                android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/api_app_settings_fragment" />
 
-        <FrameLayout
-            android:id="@+id/api_accounts_list_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/api_settings_accounts"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <FrameLayout
+                android:id="@+id/api_accounts_list_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical" />
 
-    </LinearLayout>
-</ScrollView>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 11bc70331..34d4dbd57 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <include layout="@layout/notify_area" />
 
-    <ScrollView xmlns:tools="http://schemas.android.com/tools"
+    <ScrollView
         android:layout_width="wrap_content"
         android:layout_height="match_parent">
 
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 5a6f732d5..736617ba5 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -1,55 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
+    <include layout="@layout/notify_area" />
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical">
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_key_server" />
+        android:layout_height="match_parent">
 
-        <Spinner
-            android:id="@+id/upload_key_keyserver"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_actions"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/upload_key_action_upload"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/btn_export_to_server"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_upload"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:clickable="true"
-            style="@style/SelectableItem" />
-
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_key_server" />
+
+            <Spinner
+                android:id="@+id/upload_key_keyserver"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="4dp" />
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_actions"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/upload_key_action_upload"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:layout_marginBottom="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/btn_export_to_server"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:drawableRight="@drawable/ic_action_upload"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:clickable="true"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 50aea621ba4de844cf6eee077d1f5b14d0247f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 21:51:35 +0200
Subject: Fix animations in create key

---
 .../main/res/layout/create_key_final_fragment.xml  | 36 +++++++---------------
 OpenKeychain/src/main/res/values/strings.xml       |  2 ++
 2 files changed, 13 insertions(+), 25 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 74231142a..64b3621a4 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -20,14 +20,14 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="16dp"
                 android:paddingBottom="8dp"
-                android:text="You entered the following credentials:"
+                android:text="@string/create_key_final_text"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="2dp"
-                android:text="Name"
+                android:text="@string/label_name"
                 android:textColor="@color/tertiary_text_light"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -44,7 +44,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="2dp"
-                android:text="Email"
+                android:text="@string/label_email"
                 android:textColor="@color/tertiary_text_light"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -76,30 +76,16 @@
                 android:layout_height="1dip"
                 android:background="?android:attr/listDivider" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="8dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/imageView"
-                    android:src="@drawable/create_key_robot"
-                    android:layout_gravity="center_vertical" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:text="Creating a key may take a while, have a cup of coffee in the meantime…\n(3 subkeys, RSA, 4096 bit)"
-                    android:textColor="@color/android_green_dark"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/textView" />
-
-            </LinearLayout>
+                android:text="@string/create_key_final_robot_text"
+                android:textColor="@color/android_green_dark"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:drawableLeft="@drawable/create_key_robot"
+                android:drawablePadding="8dp" />
 
         </LinearLayout>
     </ScrollView>
@@ -123,7 +109,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="back"
+            android:text="@string/btn_back"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 0cffdd28a..bcd4d3bbc 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -508,6 +508,8 @@
     <string name="create_key_upload">Upload key to keyserver</string>
     <string name="create_key_empty">This field is required</string>
     <string name="create_key_passphrases_not_equal">Passphrases do not match</string>
+    <string name="create_key_final_text">You entered the following credentials:</string>
+    <string name="create_key_final_robot_text">Creating a key may take a while, have a cup of coffee in the meantime…\n(3 subkeys, RSA, 4096 bit)</string>
 
     <!-- View key -->
     <string name="view_key_revoked">This key has been revoked!</string>
-- 
cgit v1.2.3


From db70fcfdbf63a604ccd4c8977888937161a5a9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 23:13:29 +0200
Subject: Create key: design fixes

---
 .../main/res/layout/create_key_final_fragment.xml  |  4 +--
 .../main/res/layout/create_key_input_fragment.xml  | 29 ++++++++++++++++------
 .../src/main/res/layout/first_time_activity.xml    |  4 ++-
 .../src/main/res/layout/key_list_fragment.xml      |  4 ++-
 .../src/main/res/layout/key_list_header.xml        |  2 +-
 .../src/main/res/layout/view_key_main_fragment.xml |  1 -
 OpenKeychain/src/main/res/menu/key_list.xml        |  7 +++++-
 OpenKeychain/src/main/res/values/strings.xml       | 16 ++++++------
 8 files changed, 45 insertions(+), 22 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 64b3621a4..6814cd259 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -37,7 +37,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
                 android:layout_marginLeft="8dp"
-                android:text="Max Mustermann"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
             <TextView
@@ -52,7 +51,6 @@
                 android:id="@+id/email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="max@musterman.com"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_marginBottom="8dp"
                 android:layout_marginLeft="8dp" />
@@ -131,7 +129,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/title_create_key"
+            android:text="@string/btn_create_key"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:drawableRight="@drawable/ic_action_new_account"
             android:drawablePadding="8dp"
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index 30ccc05ab..588cbb050 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -17,20 +17,28 @@
             android:orientation="vertical">
 
             <TextView
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/create_key_text" />
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="16dp"
-                android:paddingBottom="8dp"
-                android:text="@string/create_key_text"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:layout_marginTop="8dp"
+                android:text="@string/label_user_id" />
 
             <AutoCompleteTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:imeOptions="actionNext"
                 android:inputType="textPersonName"
-                android:hint="@string/label_name"
+                android:hint="@string/create_key_hint_full_name"
                 android:ems="10"
                 android:id="@+id/name" />
 
@@ -44,10 +52,17 @@
                 android:ems="10"
                 android:inputType="textEmailAddress" />
 
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_passphrase" />
+
             <EditText
                 android:id="@+id/passphrase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:inputType="textPassword"
                 android:hint="@string/label_passphrase"
@@ -117,7 +132,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/title_create_key"
+            android:text="@string/btn_next"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:drawableRight="@drawable/ic_action_new_account"
             android:drawablePadding="8dp"
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index fad1a3b26..2d750c1a7 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -33,9 +33,10 @@
                 android:layout_weight="1"
                 android:text="@string/first_time_import_key"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_download"
+                android:drawableRight="@drawable/ic_action_collection"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
                 android:clickable="true"
                 style="@style/SelectableItem" />
 
@@ -59,6 +60,7 @@
                 android:drawableRight="@drawable/ic_action_new_account"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
                 android:clickable="true"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 32b77baac..f1da19b72 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -56,6 +56,7 @@
             android:textSize="14sp"
             android:text="@string/key_list_empty_button_create"
             android:drawableLeft="@drawable/ic_action_new_account"
+            android:drawablePadding="8dp"
             android:background="@drawable/button_edgy"/>
 
         <TextView
@@ -73,7 +74,8 @@
             android:layout_margin="4dp"
             android:textSize="14sp"
             android:text="@string/key_list_empty_button_import"
-            android:drawableLeft="@drawable/ic_action_download"
+            android:drawableLeft="@drawable/ic_action_collection"
+            android:drawablePadding="8dp"
             android:background="@drawable/button_edgy" />
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/key_list_header.xml b/OpenKeychain/src/main/res/layout/key_list_header.xml
index 8cb0d4262..4809fc5ab 100644
--- a/OpenKeychain/src/main/res/layout/key_list_header.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_header.xml
@@ -21,7 +21,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_marginRight="8dp"
-        android:visibility="visible"
+        android:visibility="gone"
         android:textColor="@android:color/darker_gray" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index b11538ba9..27e0ab22e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -17,7 +17,6 @@
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_marginBottom="4dp"
             android:layout_marginTop="8dp"
             android:text="@string/section_user_ids"
             android:layout_weight="1" />
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index e865df182..056dd5986 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -10,7 +10,7 @@
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item
-        android:id="@+id/menu_key_list_import"
+        android:id="@+id/menu_key_list_add"
         app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_action_add_person"
         android:title="@string/menu_add_keys" />
@@ -26,6 +26,11 @@
         app:showAsAction="never"
         android:title="@string/menu_create_key" />
 
+    <item
+        android:id="@+id/menu_key_list_import_existing_key"
+        app:showAsAction="never"
+        android:title="@string/menu_import_existing_key" />
+
     <item
         android:id="@+id/menu_key_list_debug_read"
         app:showAsAction="never"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index bcd4d3bbc..5e3001201 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -7,7 +7,7 @@
     <string name="title_encrypt">Encrypt</string>
     <string name="title_decrypt">Decrypt</string>
     <string name="title_authentication">Passphrase</string>
-    <string name="title_create_key">Create Key</string>
+    <string name="title_create_key">Create My Key</string>
     <string name="title_edit_key">Edit Key</string>
     <string name="title_preferences">Preferences</string>
     <string name="title_api_registered_apps">Apps</string>
@@ -71,14 +71,15 @@
     <string name="btn_encryption_advanced_settings_hide">Hide advanced settings</string>
     <string name="btn_share_encrypted_signed">Share encrypted/signed message…</string>
     <string name="btn_view_cert_key">View certification key</string>
+    <string name="btn_create_key">Create key</string>
 
     <!-- menu -->
     <string name="menu_preferences">Settings</string>
     <string name="menu_help">Help</string>
     <string name="menu_export_key">Export to file</string>
     <string name="menu_delete_key">Delete key</string>
-    <string name="menu_create_key">Create key</string>
-    <string name="menu_create_key_expert">Create key (expert)</string>
+    <string name="menu_create_key">Create my key</string>
+    <string name="menu_import_existing_key">Import existing key</string>
     <string name="menu_search">Search</string>
     <string name="menu_key_server">Keyserver…</string>
     <string name="menu_update_key">Update from keyserver</string>
@@ -475,7 +476,7 @@
     <string name="key_list_empty_text2">You can start by</string>
     <string name="key_list_empty_text3">or</string>
     <string name="key_list_empty_button_create">creating your own key</string>
-    <string name="key_list_empty_button_import">importing keys.</string>
+    <string name="key_list_empty_button_import">importing an existing key.</string>
 
     <!-- Key view -->
     <string name="key_view_action_edit">Edit key</string>
@@ -504,12 +505,13 @@
     </string-array>
 
     <!-- Create key -->
-    <string name="create_key_text">Enter Full Name, Email and a Passphrase.</string>
     <string name="create_key_upload">Upload key to keyserver</string>
     <string name="create_key_empty">This field is required</string>
     <string name="create_key_passphrases_not_equal">Passphrases do not match</string>
     <string name="create_key_final_text">You entered the following credentials:</string>
     <string name="create_key_final_robot_text">Creating a key may take a while, have a cup of coffee in the meantime…\n(3 subkeys, RSA, 4096 bit)</string>
+    <string name="create_key_text">Enter your full name, email address, and choose a passhrase.</string>
+    <string name="create_key_hint_full_name">Full Name, e.g. Max Mustermann</string>
 
     <!-- View key -->
     <string name="view_key_revoked">This key has been revoked!</string>
@@ -740,8 +742,8 @@
 
     <!-- First Time -->
     <string name="first_time_text1">Take back your privacy with OpenKeychain!</string>
-    <string name="first_time_create_key">Create Key</string>
-    <string name="first_time_import_key">Import Key</string>
+    <string name="first_time_create_key">Create my key</string>
+    <string name="first_time_import_key">Import existing key</string>
     <string name="first_time_skip">Skip Setup</string>
 
 </resources>
-- 
cgit v1.2.3


From 97209f9d3d5a184f30dbde5b58e7d47703a17ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 23:31:09 +0200
Subject: Fixes for upload

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 5e3001201..d5e6fc298 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -300,6 +300,7 @@
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
+    <string name="progress_uploading">uploading…</string>
     <string name="progress_building_key">building key…</string>
     <string name="progress_certifying_master_key">certifying master key…</string>
     <string name="progress_building_master_key">building master ring…</string>
-- 
cgit v1.2.3


From 3e918a70eabdd8c5becf41b2d7840b1eaec2caf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Jul 2014 23:34:13 +0200
Subject: Remove private/secret key language from strings

---
 OpenKeychain/src/main/res/values/strings.xml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d5e6fc298..70a70d238 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -2,8 +2,8 @@
 <resources>
 
     <!-- title -->
-    <string name="title_select_recipients">Select Public Key</string>
-    <string name="title_select_secret_key">Select Secret Key</string>
+    <string name="title_select_recipients">Select Keys</string>
+    <string name="title_select_secret_key">Select Your Key</string>
     <string name="title_encrypt">Encrypt</string>
     <string name="title_decrypt">Decrypt</string>
     <string name="title_authentication">Passphrase</string>
@@ -218,7 +218,7 @@
     <string name="ask_save_changed_key">You have made changes to the keyring, would you like to save it?</string>
     <string name="ask_empty_id_ok">You have added an empty identity, are you sure you want to continue?</string>
     <string name="public_key_deletetion_confirmation">Do you really want to delete the public key \'%s\'?\nYou can\'t undo this!</string>
-    <string name="also_export_secret_keys">Also export secret keys?</string>
+    <string name="also_export_secret_keys">Also export secret keys</string>
 
     <string name="key_exported">Successfully exported 1 key.</string>
     <string name="keys_exported">Successfully exported %d keys.</string>
@@ -349,7 +349,6 @@
 
     <!-- action strings -->
     <string name="hint_public_keys">Name/Email/Key ID…</string>
-    <string name="hint_secret_keys">Search Secret Keys</string>
     <string name="action_share_key_with">Share Key with…</string>
     <string name="hint_keybase_search">Name/Keybase.io username…</string>
 
@@ -450,7 +449,7 @@
     <string name="api_settings_package_signature">SHA-256 of Package Signature</string>
     <string name="api_settings_accounts">Accounts</string>
     <string name="api_settings_accounts_empty">No accounts attached to this app.</string>
-    <string name="api_create_account_text">The app requests the creation of a new account. Please select an existing private key or create a new one.\nApps are restricted to the usage of keys you select here!</string>
+    <string name="api_create_account_text">The app requests the creation of a new account. Please select one of your existing keys or create a new one.\nApps are restricted to the usage of keys you select here!</string>
     <string name="api_register_text">The displayed app wants to encrypt/decrypt messages and sign them in your name.\nAllow access?\n\nWARNING: If you do not know why this screen appeared, disallow access! You can revoke access later using the \'Apps\' screen.</string>
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>
@@ -528,9 +527,6 @@
     <string name="drawer_close">Close navigation drawer</string>
     <string name="edit">Edit</string>
     <string name="my_keys">My Keys</string>
-    <string name="label_secret_key">Secret Key</string>
-    <string name="secret_key_yes">available</string>
-    <string name="secret_key_no">unavailable</string>
 
     <!-- hints -->
     <string name="encrypt_content_edit_text_hint">Write message here to encrypt and/or sign…</string>
@@ -732,7 +728,7 @@
     <string name="error_key_processing">Error processing key!</string>
     <string name="no_subkey">subkey unavailable</string>
     <string name="key_stripped">stripped</string>
-    <string name="secret_cannot_multiple">Secret keys can only be deleted individually!</string>
+    <string name="secret_cannot_multiple">Your own keys can only be deleted individually!</string>
     <string name="title_view_cert">View Certificate Details</string>
     <string name="unknown_algorithm">unknown</string>
     <string name="can_sign_not">cannot sign</string>
-- 
cgit v1.2.3


From 3d7cdf5428f7b6fbd3bd6b5b3fda24c87a62bfb8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 31 Jul 2014 23:45:19 +0200
Subject: move upload/update buttons from menu to buttons

---
 .../src/main/res/layout/view_key_main_fragment.xml | 22 +++++++++++++++++++++
 .../main/res/layout/view_key_share_fragment.xml    | 23 ++++++++++++++++++++++
 OpenKeychain/src/main/res/menu/key_view.xml        | 17 ----------------
 OpenKeychain/src/main/res/values/strings.xml       |  4 ++--
 4 files changed, 47 insertions(+), 19 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index 27e0ab22e..38769324e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -110,6 +110,28 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_update"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_update"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_download"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
     </LinearLayout>
 
 </ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
index 1cd2b9f1b..a8786c461 100644
--- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
@@ -124,6 +124,29 @@
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_upload"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_upload"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_upload"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:editable="false" />
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 64877d725..5a156b5ac 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -2,23 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/menu_key_keyserver"
-        android:icon="@drawable/ic_action_cloud"
-        app:showAsAction="always"
-        android:title="@string/menu_key_server">
-        <menu>
-            <item
-                android:id="@+id/menu_key_view_update"
-                app:showAsAction="never"
-                android:title="@string/menu_update_key" />
-            <item
-                android:id="@+id/menu_key_view_export_keyserver"
-                app:showAsAction="never"
-                android:title="@string/menu_export_key_to_server" />
-        </menu>
-    </item>
-
     <item
         android:id="@+id/menu_key_view_export_file"
         android:icon="@drawable/ic_action_import_export"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 70a70d238..9d2c5efb5 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -82,8 +82,6 @@
     <string name="menu_import_existing_key">Import existing key</string>
     <string name="menu_search">Search</string>
     <string name="menu_key_server">Keyserver…</string>
-    <string name="menu_update_key">Update from keyserver</string>
-    <string name="menu_export_key_to_server">Upload to key server</string>
     <string name="menu_share">Share…</string>
     <string name="menu_share_title_fingerprint">Share fingerprint…</string>
     <string name="menu_share_title">Share whole key…</string>
@@ -482,8 +480,10 @@
     <string name="key_view_action_edit">Edit key</string>
     <string name="key_view_action_encrypt">Encrypt with this key</string>
     <string name="key_view_action_certify">Certify identities</string>
+    <string name="key_view_action_update">Update from keyserver</string>
     <string name="key_view_action_share_with">Share with…</string>
     <string name="key_view_action_share_nfc">Share over NFC by holding the devices back to back</string>
+    <string name="key_view_action_upload">Upload to key server</string>
     <string name="key_view_tab_main">Main Info</string>
     <string name="key_view_tab_share">Share</string>
     <string name="key_view_tab_keys">Subkeys</string>
-- 
cgit v1.2.3


From a25ca5429fc9b54dd41ee3c7f261710de8100c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 1 Aug 2014 00:22:15 +0200
Subject: Certifying instead of signing

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 9d2c5efb5..d06712699 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -339,6 +339,7 @@
     <string name="progress_processing_signature">processing signature…</string>
     <string name="progress_verifying_signature">verifying signature…</string>
     <string name="progress_signing">signing…</string>
+    <string name="progress_certifying">certifying…</string>
     <string name="progress_reading_data">reading data…</string>
     <string name="progress_finding_key">finding key…</string>
     <string name="progress_decompressing_data">decompressing data…</string>
-- 
cgit v1.2.3


From 79f69f2fcee67e347d1b072ced74947393e144bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 1 Aug 2014 00:38:36 +0200
Subject: Start fixing CachedPublicKeyRing

---
 OpenKeychain/src/main/res/layout/view_key_main_fragment.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
index 38769324e..7a54fab05 100644
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
@@ -97,7 +97,6 @@
             android:id="@+id/view_key_action_encrypt"
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
-            android:layout_marginBottom="8dp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-- 
cgit v1.2.3


From d2f50eb60f38a52df272522e2b1fef57928d691d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 1 Aug 2014 09:34:07 +0200
Subject: identity instead of credentials

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d06712699..2842eb8fc 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -509,7 +509,7 @@
     <string name="create_key_upload">Upload key to keyserver</string>
     <string name="create_key_empty">This field is required</string>
     <string name="create_key_passphrases_not_equal">Passphrases do not match</string>
-    <string name="create_key_final_text">You entered the following credentials:</string>
+    <string name="create_key_final_text">You entered the following identity:</string>
     <string name="create_key_final_robot_text">Creating a key may take a while, have a cup of coffee in the meantime…\n(3 subkeys, RSA, 4096 bit)</string>
     <string name="create_key_text">Enter your full name, email address, and choose a passhrase.</string>
     <string name="create_key_hint_full_name">Full Name, e.g. Max Mustermann</string>
-- 
cgit v1.2.3