commit dd0dbb10a55f3486f7092f18bea558e32e216865
author Yoshiaki Naka <yoshiaki.naka@sonymobile.com> Thu Aug 03 21:20:38 2017 +0900
committer Jordan Liu <jminjie@google.com> Mon Sep 25 12:21:15 2017 -0700
tree c5cd03e36e53f230e21df164f19c76a321714e64
parent 8ffca3e4b7b42d2449cbc5000130c8e08994e280

Icon must be placed near the text string on the input screen

A small icon can be displayed on the action bar of the input screen in
the current implementation, but it is better to display it near the text
string because icon can replace text string if it is self-explanatory
icon. The size of text string should also be enlarged.

Bug: 64371064
Test: Manual - Verified both with icon and without icon cases.

Change-Id: I36a3dde9cc3717bb2910c55004da214d689e4274

src/com/android/stk/StkInputActivity.java

diff --git a/src/com/android/stk/StkInputActivity.java b/src/com/android/stk/StkInputActivity.java
index 9a066ec..3069edb 100755
--- a/src/com/android/stk/StkInputActivity.java
+++ b/src/com/android/stk/StkInputActivity.java
@@ -27,6 +27,7 @@
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.InputType;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.PasswordTransformationMethod;
 import android.view.KeyEvent;
@@ -373,10 +374,10 @@
         int inTypeId = R.string.alphabet;
 
         // set the prompt.
-        if (mStkInput.iconSelfExplanatory && mStkInput.icon != null) {
-            mPromptView.setVisibility(View.GONE);
-        } else {
+        if ((mStkInput.icon == null || !mStkInput.iconSelfExplanatory)
+                && !TextUtils.isEmpty(mStkInput.text)) {
             mPromptView.setText(mStkInput.text);
+            mPromptView.setVisibility(View.VISIBLE);
         }
 
         // Set input type (alphabet/digit) info close to the InText form.
@@ -390,7 +391,7 @@
         textView.setText(R.string.app_name);
 
         if (mStkInput.icon != null) {
-            ImageView imageView = (ImageView) findViewById(R.id.title_icon);
+            ImageView imageView = (ImageView) findViewById(R.id.icon);
             imageView.setImageBitmap(mStkInput.icon);
             imageView.setVisibility(View.VISIBLE);
         }