commit b97605d5a7b965e00ab4477232546f7ac3520f92
author Teruaki Minami <teruaki.x.minami@sonymobile.com> Thu Jun 16 15:47:08 2016 +0900
committer Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Thu Jul 07 23:22:26 2016 +0900
tree e13bf29b798981e86a6f1b3d09972223f3e6aee4
parent a409035d51ceab9ed52ff206bf5066226ac8bd5f

Support self-explanatory icon for PLAY TONE command

ETSI TS 102 384 TC 27.22.4.5.3 fails because it is expected to display
the self-explanatory icon without the alpha identifier.

TextMessage propagates the self-explanatory option specified by PLAY
TONE command, but ToneDialog does not consider it. If the icon is self-
explanatory, it should replace the alpha identifer.

Bug: 30007740
Change-Id: I945f6456a519551c57115deb0a5335f8707bb8a4

src/com/android/stk/ToneDialog.java

diff --git a/src/com/android/stk/ToneDialog.java b/src/com/android/stk/ToneDialog.java
old mode 100644
new mode 100755
index 57a977d..834d575
--- a/src/com/android/stk/ToneDialog.java
+++ b/src/com/android/stk/ToneDialog.java
@@ -95,6 +95,10 @@
             iv.setImageBitmap(toneMsg.icon);
         }
 
+        if (toneMsg.iconSelfExplanatory && toneMsg.icon != null) {
+            tv.setVisibility(View.GONE);
+        }
+
         // Start playing tone and vibration
         if (null == settings) {
             CatLog.d(LOG_TAG, "onCreate - null settings - finish");