diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-09 00:58:33 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-09 00:58:33 +0200 |
commit | a13bcbbb5b8b6e9e6998d561182ded77d0602ae2 (patch) | |
tree | 35e6bad10a6451a915514066eec07ea02724556d /OpenKeychain/src/main | |
parent | 49b4ff63122988dc1587844e6b4b2ee5d0855385 (diff) | |
parent | f6d0347c795172a7164ad947cb6ed4c08b853f44 (diff) | |
download | open-keychain-a13bcbbb5b8b6e9e6998d561182ded77d0602ae2.tar.gz open-keychain-a13bcbbb5b8b6e9e6998d561182ded77d0602ae2.tar.bz2 open-keychain-a13bcbbb5b8b6e9e6998d561182ded77d0602ae2.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/multi_certify_item.xml (renamed from OpenKeychain/src/main/res/layout/certify_key_item.xml) | 0 |
2 files changed, 1 insertions, 1 deletions
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/multi_certify_item.xml index c578473d3..c578473d3 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_item.xml +++ b/OpenKeychain/src/main/res/layout/multi_certify_item.xml |