commit 5790c1f4b6ef0960c4da00812fcb18c08a2fe6a1
author Takeshi Shinohara <takeshi.x.shinohara@sonymobile.com> Mon Jul 25 16:52:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 25 16:52:52 2016 +0000
tree fc4f2706f4581ad28821f26657ce370518e291c4
parent f5c52b80e0213bada495de3c852dbc1d4eb2b843
parent 4bdae1b0a4575617bc92473f3546e0a97b8c0752

Merge \\\"Support self-explanatory icon for GET INKEY and GET INPUT commands\\\" am: c0eda576ba am: 39531a94d0
am: 4bdae1b0a4

Change-Id: I62a1271a275d08c6f427840714cea5549fd3fe84

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) {