TODO fixes from Teleca 090527
[android/platform/packages/apps/Phone.git] / src / com / android / phone / NotificationMgr.java
index 9c7237f..b96e71c 100644 (file)
@@ -539,8 +539,11 @@ public class NotificationMgr implements CallerInfoAsyncQuery.OnQueryCompleteList
         }
     }
 
+    void updateInCallNotification() {
+        updateInCallNotification(false);
+    }
+
     private void updateInCallNotification(boolean enhancedVoicePrivacy) {
-        // WINK:TODO: Teleca, what is the correct code here.
         int resId;
         if (DBG) log("updateInCallNotification()...");
 
@@ -564,11 +567,17 @@ public class NotificationMgr implements CallerInfoAsyncQuery.OnQueryCompleteList
             }
         } else if (PhoneApp.getInstance().showBluetoothIndication()) {
             // Bluetooth is active.
-            resId = com.android.internal.R.drawable.stat_sys_phone_call_bluetooth;
-        } else if (enhancedVoicePrivacy) {
-            resId = android.R.drawable.stat_sys_vp_phone_call;
+            if (enhancedVoicePrivacy) {
+                resId = com.android.internal.R.drawable.stat_sys_vp_phone_call_bluetooth;
+            } else {
+                resId = com.android.internal.R.drawable.stat_sys_phone_call_bluetooth;
+            }
         } else {
-            resId = android.R.drawable.stat_sys_phone_call;
+            if (enhancedVoicePrivacy) {
+                resId = android.R.drawable.stat_sys_vp_phone_call;
+            } else {
+                resId = android.R.drawable.stat_sys_phone_call;
+            }
         }
 
         // Note we can't just bail out now if (resId == mInCallResId),
@@ -696,10 +705,6 @@ public class NotificationMgr implements CallerInfoAsyncQuery.OnQueryCompleteList
         updateMuteNotification();
     }
 
-    void updateInCallNotification() {
-        updateInCallNotification(false);
-    }
-
     /**
      * Implemented for CallerInfoAsyncQuery.OnQueryCompleteListener interface.
      * refreshes the contentView when called.