commit 53ceedc1f5ae5a075c7a3186db8bb4db32cbe583
author Nancy Chen <nancychen@google.com> Tue Jul 08 18:56:51 2014 -0700
committer Nancy Chen <nancychen@google.com> Wed Jul 16 17:24:21 2014 -0700
tree afe28232b1d91616e896f676aa7fc1780c158c42
parent 59878861a04e38ce929641813acc92829afbdf86

Add additional call state PRE_DIAL_WAIT for selection of account

If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: If1beaf60a92b4446adaaace2a72c3e0f70e61f21

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index 36f8cea..8265b20 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -62,6 +62,9 @@
 
     private static final CallsManager INSTANCE = new CallsManager();
 
+    /** Temporary flag for disabling account selection menu */
+    public static final boolean ENABLE_ACCOUNT_SELECT = true;
+
     /**
      * The main call repository. Keeps an instance of all live calls. New incoming and outgoing
      * calls are added to the map and removed when the calls move to the disconnected state.
@@ -280,9 +283,8 @@
      * Attempts to issue/connect the specified call.
      *
      * @param handle Handle to connect the call with.
-     * @param contactInfo Information about the entity being called.
      * @param gatewayInfo Optional gateway information that can be used to route the call to the
-     *         actual dialed handle via a gateway provider. May be null.
+     *        actual dialed handle via a gateway provider. May be null.
      * @param speakerphoneOn Whether or not to turn the speakerphone on once the call connects.
      * @param videoState The desired video state for the outgoing call.
      */
@@ -311,6 +313,13 @@
         // TODO(santoscordon): Move this to be a part of addCall()
         call.addListener(this);
         addCall(call);
+
+        // TODO: check for default account
+        if (account == null && ENABLE_ACCOUNT_SELECT) {
+            call.setState(CallState.PRE_DIAL_WAIT);
+            return;
+        }
+
         call.startCreateConnection();
     }
 
@@ -480,6 +489,15 @@
         }
     }
 
+    void phoneAccountSelected(Call call, PhoneAccount account) {
+        if (!mCalls.contains(call)) {
+            Log.i(this, "Attemped to add account to unknown call %s", call);
+        } else {
+            call.setPhoneAccount(account);
+            call.startCreateConnection();
+        }
+    }
+
     /** Called when the audio state changes. */
     void onAudioStateChanged(CallAudioState oldAudioState, CallAudioState newAudioState) {
         Log.v(this, "onAudioStateChanged, audioState: %s -> %s", oldAudioState, newAudioState);