commit 7cf07cb5eae3a507c42843293a546aad123a72ce
author Wink Saville <wink@google.com> Thu Dec 20 10:07:41 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 20 10:07:41 2012 -0800
tree ad61d1b7d9a2fdec42262d29d653e4f99f0ebe8c
parent ac72bff9a1fdb69260e53b277547bf4e32e8e43f
parent 3aec01c0d7d831bad20289df36fec77864f4155f

Merge "Added missing icon support to SETUP_CALLs setup phase"

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 9dcd25b..82e0257 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -547,7 +547,7 @@
                 resMsg.setResultCode(ResultCode.OK);
                 resMsg.setConfirmation(confirmed);
                 if (confirmed) {
-                    launchCallMsg();
+                    launchEventMessage(mCurrentCmd.getCallSettings().callMsg);
                 }
                 break;
             }
@@ -653,7 +653,10 @@
     }
 
     private void launchEventMessage() {
-        TextMessage msg = mCurrentCmd.geTextMessage();
+        launchEventMessage(mCurrentCmd.geTextMessage());
+    }
+
+    private void launchEventMessage(TextMessage msg) {
         if (msg == null || msg.text == null) {
             return;
         }
@@ -742,19 +745,6 @@
         } catch (InterruptedException e) {}
     }
 
-    private void launchCallMsg() {
-        TextMessage msg = mCurrentCmd.getCallSettings().callMsg;
-        if (msg.text == null || msg.text.length() == 0) {
-            return;
-        }
-        msg.title = lastSelectedItem;
-
-        Toast toast = Toast.makeText(mContext.getApplicationContext(), msg.text,
-                Toast.LENGTH_LONG);
-        toast.setGravity(Gravity.BOTTOM, 0, 0);
-        toast.show();
-    }
-
     private void launchIdleText() {
         TextMessage msg = mCurrentCmd.geTextMessage();