commit c0eda576ba70dd8acfec8231bbea0e83b36c95a9
author Amit Mahajan <amitmahajan@google.com> Mon Jul 25 16:31:05 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 25 16:31:05 2016 +0000
tree 99e3b4ce440d467000d7325ff3f45615931387f8
parent a7d25a2ab85414eac894df6d20b0dec42409e3c5
parent c658900bb8312fad2cb1492309851e476ef596dd

Merge "Support self-explanatory icon for GET INKEY and GET INPUT commands"

src/com/android/stk/StkInputActivity.java

diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index 53bea93..4dbad00 100644
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -357,7 +357,11 @@
         int inTypeId = R.string.alphabet;
 
         // set the prompt.
-        mPromptView.setText(mStkInput.text);
+        if (mStkInput.iconSelfExplanatory && mStkInput.icon != null) {
+            mPromptView.setVisibility(View.GONE);
+        } else {
+            mPromptView.setText(mStkInput.text);
+        }
 
         // Set input type (alphabet/digit) info close to the InText form.
         if (mStkInput.digitOnly) {