From a42005350c1dd0aa956fe5f911f59e704b58c1c7 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Tue, 17 Mar 2015 14:28:21 -0700
Subject: DO NOT MERGE Don't hide caller photo for video call

Bug: 19728020
Change-Id: I6e5259c63553de9e5060621bcc749d1039b67ea1
---
 InCallUI/src/com/android/incallui/CallCardFragment.java | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'InCallUI/src/com/android/incallui/CallCardFragment.java')

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 814876105..cc7efe7f9 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -787,16 +787,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         }
     }
 
-    /**
-     * Changes the visibility of the contact photo.
-     *
-     * @param isVisible {@code True} if the UI should show the contact photo.
-     */
-    @Override
-    public void setPhotoVisible(boolean isVisible) {
-        mPhoto.setVisibility(isVisible ? View.VISIBLE : View.GONE);
-    }
-
     /**
      * Changes the visibility of the HD audio icon.
      *
-- 
cgit v1.2.3


From 82332c921b8dcef213700822e2404b005adab00c Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Fri, 20 Mar 2015 13:57:17 -0700
Subject: Don't show SSID for Wi-Fi calls.

- Delete wifi icon and method to get SSID.
+ Use labels provided by StatusHints instead.

I'm not very happy with the additional "isWifi" cases I ended up
adding in call card fragment.

I felt this was necessary because of assumptions in some cases
that if a label is provided, it should be formatted as a phone
account source. While this was true before, it's becoming less so.
I feel like the fragment shouldn't have to worry about formatting
or choosing the label based on the call and  conditions. It should
just display the label if it thinks it is appropriate to show a
label given the call state.

To fix that, it seems like logic should be moved to the presenter
instead, and possibly to Telephony. But, I'm hesitant to do that
until these WFC changes back merge to master because of potential
merge conflicts and its slightly more risky for this branch,
because it starts dealing with logic/flows outside of WFC..

Bug: 19866988
Change-Id: Iacd5a09259c84ea7be28b0170ae603eb9561f7ca
---
 .../src/com/android/incallui/CallCardFragment.java   | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'InCallUI/src/com/android/incallui/CallCardFragment.java')

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 814876105..28f449b93 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -488,10 +488,11 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             DisconnectCause disconnectCause,
             String connectionLabel,
             Drawable callStateIcon,
-            String gatewayNumber) {
+            String gatewayNumber,
+            boolean isWifi) {
         boolean isGatewayCall = !TextUtils.isEmpty(gatewayNumber);
         CharSequence callStateLabel = getCallStateLabelFromState(state, videoState,
-                sessionModificationState, disconnectCause, connectionLabel, isGatewayCall);
+                sessionModificationState, disconnectCause, connectionLabel, isGatewayCall, isWifi);
 
         Log.v(this, "setCallState " + callStateLabel);
         Log.v(this, "DisconnectCause " + disconnectCause.toString());
@@ -499,6 +500,10 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
         if (TextUtils.equals(callStateLabel, mCallStateLabel.getText())) {
             // Nothing to do if the labels are the same
+            if (state == Call.State.ACTIVE || state == Call.State.CONFERENCED) {
+                mCallStateLabel.clearAnimation();
+                mCallStateIcon.clearAnimation();
+            }
             return;
         }
 
@@ -652,10 +657,11 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
      *         2. Ongoing calls will display the name of the provider.
      *         3. Incoming calls will only display "Incoming via..." for accounts.
      *         4. Video calls, and session modification states (eg. requesting video).
+     *         5. Incoming and active Wi-Fi calls will show label provided by hint.
      */
     private CharSequence getCallStateLabelFromState(int state, int videoState,
             int sessionModificationState, DisconnectCause disconnectCause, String label,
-            boolean isGatewayCall) {
+            boolean isGatewayCall, boolean isWifi) {
         final Context context = getView().getContext();
         CharSequence callStateLabel = null;  // Label to display as part of the call banner
 
@@ -669,7 +675,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             case Call.State.ACTIVE:
                 // We normally don't show a "call state label" at all in this state
                 // (but we can use the call state label to display the provider name).
-                if (isAccount) {
+                if (isAccount || isWifi) {
                     callStateLabel = label;
                 } else if (sessionModificationState
                         == Call.SessionModificationState.REQUEST_FAILED) {
@@ -686,7 +692,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
                 break;
             case Call.State.CONNECTING:
             case Call.State.DIALING:
-                if (isSpecialCall) {
+                if (isSpecialCall && !isWifi) {
                     callStateLabel = context.getString(R.string.calling_via_template, label);
                 } else {
                     callStateLabel = context.getString(R.string.card_title_dialing);
@@ -697,7 +703,9 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
                 break;
             case Call.State.INCOMING:
             case Call.State.CALL_WAITING:
-                if (isAccount) {
+                if (isWifi) {
+                    callStateLabel = label;
+                } else if (isAccount) {
                     callStateLabel = context.getString(R.string.incoming_via_template, label);
                 } else if (VideoProfile.VideoState.isBidirectional(videoState)) {
                     callStateLabel = context.getString(R.string.notification_incoming_video_call);
-- 
cgit v1.2.3