TODO fixes from Teleca 090527
Wink Saville [Mon, 1 Jun 2009 21:40:39 +0000 (14:40 -0700)]
src/com/android/phone/CallNotifier.java
src/com/android/phone/CellBroadcastSms.java
src/com/android/phone/InCallScreen.java
src/com/android/phone/NotificationMgr.java
src/com/android/phone/PhoneApp.java

index f875f25..edb00cd 100644 (file)
@@ -263,13 +263,6 @@ public class CallNotifier extends Handler
     }
 
     private void onCdmaCallwaiting(AsyncResult r) {
-      /**
-       * TODO(Teleca): From one of our UI engineers: "FWIW, this can probably just
-       * be another path thru onNewRingingConnection(), since that method already
-       * can tell the difference between a regular incoming call and a call-waiting
-       * call (for GSM, so far at least.)
-       */
-       // TODO: write the code
        return;
     }
 
index e110121..a5369f7 100644 (file)
@@ -626,6 +626,7 @@ public class CellBroadcastSms extends PreferenceActivity
             return(mBSelected);
         }
         
+        // TODO: Change the return value to a RIL_BroadcastSMSConfig
         private static int[] getCbSmsAllValues() {
             return(mConfigDataComplete);
         }
index ce3d74d..f723b6d 100644 (file)
@@ -1038,8 +1038,6 @@ public class InCallScreen extends Activity
         final boolean hasHoldingCall = !mBackgroundCall.isIdle();
 
         if (mPhone.getPhoneName().equals("CDMA")) {
-            // WINK:TODO Teleca is this enough?
-
             // The green CALL button means either "Answer", "Swap calls/On Hold", or
             // "Add to 3WC", depending on the current state of the Phone.
 
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.
index ef3c7de..364e614 100644 (file)
@@ -1181,7 +1181,7 @@ public class PhoneApp extends Application {
         if (!isCdma) eriText = "";
 
         if (!hasService) {
-            eriText = EriInfo.SEARCHING_TEXT;
+            eriText = getText(com.android.internal.R.string.roamingTextSearching).toString();
         } else {
             eriText = phone.getCdmaEriText();
         }