commit cad797743af366c66a149b1db5356e816f437125
author David Krause <david.krause@motorola.com> Tue Jun 02 04:13:01 2009 -0500
committer Wink Saville <wink@google.com> Thu Jun 25 00:11:43 2009 -0700
tree dd1be6bc797419a65df3af7366157fa8b1f36fe5
parent e2c9e16a099b6a120db0a589ad1959b8787b9f9b

apps/phone: CDMA voicemail support

Depends on change 76, which includes the necessary framework support

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2edfb84..c57c9f9 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -817,6 +817,9 @@
     <string name="notification_on_hold">On hold</string>
     <!-- Label for the "Voicemail" notification item, when expanded. -->
     <string name="notification_voicemail_title">New voicemail</string>
+    <!-- Label for the expanded "Voicemail" notification item,
+         including a count of messages. -->
+    <string name="notification_voicemail_title_count">New voicemail (<xliff:g id="count">%d</xliff:g>)</string>
     <!-- Message displayed in the "Voicemail" notification item, allowing the user
          to dial the indicated number. -->
     <string name="notification_voicemail_text_format">Dial <xliff:g id="voicemail_number">%s</xliff:g></string>

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index b96e71c..9be35db 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -800,6 +800,13 @@
                 }
             }
 
+            if (mPhone.getPhoneName().equals("CDMA")) {
+                String finalTitle;
+                int vmCount = mPhone.getVoiceMessageCount();
+                String titleFormat = mContext.getString(R.string.notification_voicemail_title_count);
+                notificationTitle = String.format(titleFormat, vmCount);
+            }
+
             String notificationText;
             if (TextUtils.isEmpty(vmNumber)) {
                 notificationText = mContext.getString(

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 176afcb..a034628 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -647,13 +647,12 @@
     public String getCdmaEriText() {
         return mPhone.getCdmaEriText();
     }
-    
+
     /**
      * Returns the unread count of voicemails
      */
-   public int getCountVoiceMessages() {
-       // TODO(Moto): implement
-       return 0;
-   }
+    public int getVoiceMessageCount() {
+        return mPhone.getVoiceMessageCount();
+    }
 
 }