From a7adb0536ec09eb0989ade517c175e458fd19104 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Wed, 23 Apr 2014 18:40:36 -0700
Subject: Fix use of TelecommAdapter.

Change-Id: Ia89b3481c7be6b31624eda8f19fd9868b95777d5
---
 InCallUI/src/com/android/incallui/CallCardPresenter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index aa6cb2cc0..42871b1d6 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -480,7 +480,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
             return;
         }
 
-        CallCommandClient.getInstance().disconnectCall(mPrimary.getCallId());
+        TelecommAdapter.getInstance().disconnectCall(mPrimary.getCallId());
     }
 
     public interface CallCardUi extends Ui {
-- 
cgit v1.2.3


From 9fc169931b9904ee8eac27bacd858ab87753e33d Mon Sep 17 00:00:00 2001
From: Evan Charlton <evanc@google.com>
Date: Fri, 25 Apr 2014 13:00:19 -0700
Subject: Fix the build

Update the call state and getUi() breakages from an earlier merge.

Change-Id: I5b5dbbc6fca1ccdebe04dd99ad65b524b9d63686
---
 InCallUI/src/com/android/incallui/CallCardFragment.java  |  3 ++-
 InCallUI/src/com/android/incallui/CallCardPresenter.java | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 0eb77373f..3ad1b078f 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -16,11 +16,13 @@
 
 package com.android.incallui;
 
+import android.animation.LayoutTransition;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.telephony.DisconnectCause;
 import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -32,7 +34,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.contacts.common.util.ViewUtil;
-import com.android.services.telephony.common.Call;
 
 import java.util.List;
 
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 5569a36aa..98c134467 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -186,6 +186,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
     }
 
     private void setUiCallState() {
+        int state = Call.State.IDLE;
+
         if (mPrimary != null) {
             boolean bluetoothOn =
                     (AudioModeProvider.getInstance().getAudioMode() == AudioMode.BLUETOOTH);
@@ -198,17 +200,19 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
             // Cache the value so the UI doesn't change when the call ends.
             mIsWiFiCachedValue = isWiFi;
 
-            getUi().setCallState(mPrimary.getState(), mPrimary.getDisconnectCause(), bluetoothOn,
+            state = mPrimary.getState();
+
+            getUi().setCallState(state, mPrimary.getDisconnectCause(), bluetoothOn,
                     getGatewayLabel(), getGatewayNumber(), isWiFi, isHandoffCapable,
                     isHandoffPending);
         } else {
-            getUi().setCallState(Call.State.IDLE, DisconnectCause.NOT_VALID, false, null, null,
+            getUi().setCallState(state, DisconnectCause.NOT_VALID, false, null, null,
                     mIsWiFiCachedValue, false, false);
         }
 
-        final boolean enableEndCallButton = state.isConnectingOrConnected() &&
-                !state.isIncoming() && mPrimary != null;
-        ui.setEndCallButtonEnabled(enableEndCallButton);
+        final boolean enableEndCallButton = Call.State.isConnected(state) &&
+                state != Call.State.INCOMING && mPrimary != null;
+        getUi().setEndCallButtonEnabled(enableEndCallButton);
     }
 
     @Override
-- 
cgit v1.2.3


From f89a6ff0918c5af0703f68401db48f9709948463 Mon Sep 17 00:00:00 2001
From: Evan Charlton <evanc@google.com>
Date: Thu, 1 May 2014 09:15:28 -0700
Subject: Fix the build

Somewhere along the line, we dropped a resource (and a variable name
was changed). Fix these errors.

Change-Id: I06ce956961e8bf0e08f03d51651bf48262055703
---
 InCallUI/res/values/dimens.xml                          | 5 +++++
 InCallUI/src/com/android/incallui/CallCardFragment.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 0ecfab45f..e9dd26bc9 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -37,6 +37,11 @@
     <!-- Padding at the top and bottom edges of the "provider information" -->
     <dimen name="provider_info_top_bottom_padding">8dp</dimen>
 
+    <!-- Text size for the name in the call info. -->
+    <dimen name="call_name_text_size">36sp</dimen>
+    <!-- Text size for the call info label and number. -->
+    <dimen name="call_label_text_size">18sp</dimen>
+
     <!-- Right padding for name and number fields in the call banner.
          This padding is used to ensure that ultra-long names or
          numbers won't overlap the elapsed time indication. -->
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index d86b01b6b..29ec687ac 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -329,7 +329,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
     private void updateCallStateLabel(int state, boolean bluetoothOn, String text) {
         // Update the call state label.
-        mCallStateLabel.setText(callStateLabel);
+        mCallStateLabel.setText(text);
 
         if (Call.State.INCOMING == state) {
             setBluetoothOn(bluetoothOn);
-- 
cgit v1.2.3


From 09bbf1595013b3d871230c368d26d577f60a0b8a Mon Sep 17 00:00:00 2001
From: Evan Charlton <evanc@google.com>
Date: Fri, 9 May 2014 13:23:34 -0700
Subject: Re-add network indicator/handoff button

Add a handoff button (and network indicator) back into InCallUI. This
has not be vetted by UX or anything, but it will hopefully not cause
merge conflicts.

Change-Id: I6d0a8e7cd865df70b13fc69ec96cdc98e0e3f203
---
 InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png   | Bin 0 -> 4997 bytes
 InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png   | Bin 0 -> 3065 bytes
 .../floating_handoff_button_active_background.xml  |  28 +++++++++++++++++
 ...floating_handoff_button_compound_background.xml |  24 +++++++++++++++
 ...floating_handoff_button_disabled_background.xml |  28 +++++++++++++++++
 .../floating_handoff_button_pressed_background.xml |  28 +++++++++++++++++
 InCallUI/res/layout/call_card.xml                  |  34 +++++++++++++++------
 InCallUI/res/values/colors.xml                     |  12 ++++++++
 .../src/com/android/incallui/CallCardFragment.java |  19 ++++++++++++
 9 files changed, 164 insertions(+), 9 deletions(-)
 create mode 100644 InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png
 create mode 100644 InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png
 create mode 100644 InCallUI/res/drawable/floating_handoff_button_active_background.xml
 create mode 100644 InCallUI/res/drawable/floating_handoff_button_compound_background.xml
 create mode 100644 InCallUI/res/drawable/floating_handoff_button_disabled_background.xml
 create mode 100644 InCallUI/res/drawable/floating_handoff_button_pressed_background.xml

diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png
new file mode 100644
index 000000000..3a52a2bbd
Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_in_call_pstn.png differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png
new file mode 100644
index 000000000..4fd5f333c
Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_in_call_wifi.png differ
diff --git a/InCallUI/res/drawable/floating_handoff_button_active_background.xml b/InCallUI/res/drawable/floating_handoff_button_active_background.xml
new file mode 100644
index 000000000..f06e8416b
--- /dev/null
+++ b/InCallUI/res/drawable/floating_handoff_button_active_background.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" >
+    <corners
+        android:radius="@dimen/floating_action_button_radius" />
+    <size
+        android:width="@dimen/floating_action_button_width"
+        android:height="@dimen/floating_action_button_height" />
+    <solid
+        android:color="@color/handoff_call_active_color" />
+</shape>
diff --git a/InCallUI/res/drawable/floating_handoff_button_compound_background.xml b/InCallUI/res/drawable/floating_handoff_button_compound_background.xml
new file mode 100644
index 000000000..00ee7913a
--- /dev/null
+++ b/InCallUI/res/drawable/floating_handoff_button_compound_background.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Background drawable used to render the floating circular "end call" button. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:drawable="@drawable/floating_handoff_button_disabled_background" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/floating_handoff_button_pressed_background" />
+    <item android:drawable="@drawable/floating_handoff_button_active_background" />
+</selector>
diff --git a/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml b/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml
new file mode 100644
index 000000000..68d64b8e0
--- /dev/null
+++ b/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" >
+    <corners
+        android:radius="@dimen/floating_action_button_radius" />
+    <size
+        android:width="@dimen/floating_action_button_width"
+        android:height="@dimen/floating_action_button_height" />
+    <solid
+        android:color="@color/handoff_call_disabled_color" />
+</shape>
diff --git a/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml b/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml
new file mode 100644
index 000000000..54a046973
--- /dev/null
+++ b/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" >
+    <corners
+        android:radius="@dimen/floating_action_button_radius" />
+    <size
+        android:width="@dimen/floating_action_button_width"
+        android:height="@dimen/floating_action_button_height" />
+    <solid
+        android:color="@color/handoff_call_pressed_color" />
+</shape>
diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml
index 07ecef074..4b20b8a72 100644
--- a/InCallUI/res/layout/call_card.xml
+++ b/InCallUI/res/layout/call_card.xml
@@ -80,17 +80,33 @@
         </LinearLayout>
 
         <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center">
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|center">
 
             <ImageButton android:id="@+id/endButton"
-                android:layout_width="@dimen/floating_action_button_width"
-                android:layout_height="@dimen/floating_action_button_height"
-                android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
-                android:background="@drawable/floating_end_button_compound_background"
-                android:src="@drawable/ic_in_call_phone_hangup"
-                android:contentDescription="@string/onscreenEndCallText" />
+                         android:layout_width="@dimen/floating_action_button_width"
+                         android:layout_height="@dimen/floating_action_button_height"
+                         android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
+                         android:background="@drawable/floating_end_button_compound_background"
+                         android:src="@drawable/ic_in_call_phone_hangup"
+                         android:contentDescription="@string/onscreenEndCallText" />
+
+        </FrameLayout>
+
+        <!-- Insert a CallService indicator (which controls handoff, too) -->
+        <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right">
+
+            <ImageButton android:id="@+id/handoffButton"
+                         android:enabled="false"
+                         android:layout_width="@dimen/floating_action_button_width"
+                         android:layout_height="@dimen/floating_action_button_height"
+                         android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
+                         android:background="@drawable/floating_handoff_button_compound_background"
+                         android:src="@drawable/ic_in_call_pstn" />
 
         </FrameLayout>
 
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index 0cdf93a01..6837a268d 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -47,6 +47,18 @@
     <!-- Used when the End Call button is disabled -->
     <color name="end_call_disabled_color">#303030</color>
 
+    <!-- Used when the Handoff Call button is active -->
+    <color name="handoff_call_active_color">#F2882C</color>
+
+    <!-- Used when the Handoff Call button is pressed -->
+    <color name="handoff_call_pressed_color">#F2A35E</color>
+
+    <!-- Used when the Handoff Call button is disabled -->
+    <color name="handoff_call_disabled_color">#303030</color>
+
+    <color name="call_state_wifi">#19E392</color>
+    <color name="call_state_cellular">#33A9F2</color>
+
     <!-- Color of dialpad digits -->
     <color name="dialpad_digits_text_color">#000000</color>
 
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index e21a9b14e..e58a5f6bb 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -27,6 +27,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.view.accessibility.AccessibilityEvent;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -56,6 +57,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private View mSecondaryPhotoOverlay;
 
     private View mEndCallButton;
+    private ImageButton mHandoffButton;
 
     // Cached DisplayMetrics density.
     private float mDensity;
@@ -116,6 +118,14 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             }
         });
         ViewUtil.setupFloatingActionButton(mEndCallButton, getResources());
+
+        mHandoffButton = (ImageButton) view.findViewById(R.id.handoffButton);
+        mHandoffButton.setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                getPresenter().connectionHandoffClicked();
+            }
+        });
+        ViewUtil.setupFloatingActionButton(mHandoffButton, getResources());
     }
 
     @Override
@@ -248,6 +258,9 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         Log.v(this, "DisconnectCause " + DisconnectCause.toString(cause));
         Log.v(this, "bluetooth on " + bluetoothOn);
         Log.v(this, "gateway " + gatewayLabel + gatewayNumber);
+        Log.v(this, "isWiFi " + isWiFi);
+        Log.v(this, "isHandoffCapable " + isHandoffCapable);
+        Log.v(this, "isHandoffPending " + isHandoffPending);
 
         // Update the call state label.
         mCallStateLabel.setText(callStateLabel);
@@ -255,6 +268,12 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         if (Call.State.INCOMING == state) {
             setBluetoothOn(bluetoothOn);
         }
+
+        mHandoffButton.setEnabled(isHandoffCapable && !isHandoffPending);
+        if (Call.State.ACTIVE == state) {
+            mHandoffButton.setImageResource(isWiFi ?
+                    R.drawable.ic_in_call_wifi : R.drawable.ic_in_call_pstn);
+        }
     }
 
     private void showInternetCallLabel(boolean show) {
-- 
cgit v1.2.3