Merge branch 'development' of github.com:open-keychain/open-keychain into development

2014-10-09 00:58:33 +02:00 · 2014-10-09 00:58:33 +02:00 · a13bcbbb5b
parent 49b4ff6312 f6d0347c79
commit a13bcbbb5b
2 changed files with 1 additions and 1 deletions
--- 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
--- a/OpenKeychain/src/main/res/layout/multi_certify_item.xml
+++ b/OpenKeychain/src/main/res/layout/multi_certify_item.xml