From f6d0347c795172a7164ad947cb6ed4c08b853f44 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 8 Oct 2014 22:47:30 +0200
Subject: rename certify_key_item to the more appropriate multi_certify_item

---
 .../keychain/ui/adapter/MultiUserIdsAdapter.java   |  2 +-
 .../src/main/res/layout/certify_key_item.xml       | 88 ----------------------
 .../src/main/res/layout/multi_certify_item.xml     | 88 ++++++++++++++++++++++
 3 files changed, 89 insertions(+), 89 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/certify_key_item.xml
 create mode 100644 OpenKeychain/src/main/res/layout/multi_certify_item.xml

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
index 9e48efab0..2c0bf0842 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
@@ -67,7 +67,7 @@ public class MultiUserIdsAdapter extends CursorAdapter {
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return mInflater.inflate(R.layout.certify_key_item, null);
+        return mInflater.inflate(R.layout.multi_certify_item, null);
     }
 
     @Override
diff --git a/OpenKeychain/src/main/res/layout/certify_key_item.xml b/OpenKeychain/src/main/res/layout/certify_key_item.xml
deleted file mode 100644
index c578473d3..000000000
--- a/OpenKeychain/src/main/res/layout/certify_key_item.xml
+++ /dev/null
@@ -1,88 +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:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
-    android:singleLine="true">
-
-    <LinearLayout android:id="@+id/user_id_header"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:clickable="true"
-                  android:layout_marginLeft="8dip"
-                  android:layout_marginTop="16dip">
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/user_id_header_id"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="ID: 0123 4567 890a bcde"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider"
-            android:paddingLeft="24dip"
-            android:paddingRight="24dip"
-            android:layout_marginBottom="4dip"/>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/user_id_body"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:singleLine="true"
-                  android:layout_marginLeft="8dip"
-                  android:layout_marginTop="4dip">
-
-        <CheckBox
-            android:id="@+id/user_id_item_check_box"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:clickable="false"
-            android:focusable="false" />
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_gravity="center_vertical"
-            android:layout_width="0dip"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:minHeight="48dip">
-
-            <TextView
-                android:id="@+id/user_id_item_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="alice@example.com"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_weight="1"
-                android:gravity="center_vertical"/>
-
-            <TextView
-                android:id="@+id/user_id_item_addresses"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="alice@example.com\na-lyc@example.com"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_marginLeft="20dip"
-                />
-
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_item.xml b/OpenKeychain/src/main/res/layout/multi_certify_item.xml
new file mode 100644
index 000000000..c578473d3
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/multi_certify_item.xml
@@ -0,0 +1,88 @@
+<?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:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:singleLine="true">
+
+    <LinearLayout android:id="@+id/user_id_header"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical"
+                  android:clickable="true"
+                  android:layout_marginLeft="8dip"
+                  android:layout_marginTop="16dip">
+
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/user_id_header_id"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="ID: 0123 4567 890a bcde"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:paddingLeft="24dip"
+            android:paddingRight="24dip"
+            android:layout_marginBottom="4dip"/>
+
+    </LinearLayout>
+
+    <LinearLayout android:id="@+id/user_id_body"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:singleLine="true"
+                  android:layout_marginLeft="8dip"
+                  android:layout_marginTop="4dip">
+
+        <CheckBox
+            android:id="@+id/user_id_item_check_box"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:clickable="false"
+            android:focusable="false" />
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:layout_width="0dip"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:minHeight="48dip">
+
+            <TextView
+                android:id="@+id/user_id_item_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="alice@example.com"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_weight="1"
+                android:gravity="center_vertical"/>
+
+            <TextView
+                android:id="@+id/user_id_item_addresses"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="alice@example.com\na-lyc@example.com"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_marginLeft="20dip"
+                />
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
-- 
cgit v1.2.3