From 01c444d63788b78781132ef5cc9998b0b4352e71 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 29 Mar 2015 23:38:01 +0200
Subject: even more linked id ui work

---
 .../org/sufficientlysecure/keychain/ui/widget/CertListWidget.java  | 2 --
 .../sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java   | 6 ++++++
 .../java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertListWidget.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertListWidget.java
index c8f80f4a5..0f33a3b8a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertListWidget.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertListWidget.java
@@ -133,8 +133,6 @@ public class CertListWidget extends ViewAnimator
             vCollapsed.setText("This identity is not yet verified or confirmed.");
         }
 
-        setVisibility(View.VISIBLE);
-
     }
 
     @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
index 460163a47..714933b58 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.StringRes;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.util.AttributeSet;
@@ -138,4 +139,9 @@ public class CertifyKeySpinner extends KeySpinner {
         return true;
     }
 
+    public @StringRes int getNoneString() {
+        return R.string.choice_select_cert;
+    }
+
+
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
index 70f4e7792..5a6c61f7d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
@@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.ui.widget;
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Color;
+import android.support.annotation.StringRes;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
@@ -277,7 +278,7 @@ public abstract class KeySpinner extends TintSpinner implements LoaderManager.Lo
                 TextView vKeyEmail = (TextView) view.findViewById(R.id.keyspinner_key_email);
                 TextView vKeyDuplicate = (TextView) view.findViewById(R.id.keyspinner_duplicate);
 
-                vKeyName.setText(R.string.choice_none);
+                vKeyName.setText(getNoneString());
                 vKeyEmail.setVisibility(View.GONE);
                 vKeyDuplicate.setVisibility(View.GONE);
                 vKeyStatus.setVisibility(View.GONE);
@@ -296,4 +297,8 @@ public abstract class KeySpinner extends TintSpinner implements LoaderManager.Lo
         return true;
     }
 
+    public @StringRes int getNoneString() {
+        return R.string.choice_none;
+    }
+
 }
-- 
cgit v1.2.3