From 90995fcb6778a9cb6dc35be12aeb1a5d0dcbb5ae Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Thu, 29 Aug 2013 19:37:04 -0700
Subject: Allow swapping calls by clicking on secondary call card

Bug: 9679473
Change-Id: I9e25a247c59530d257ece27e62c88329eb5f4f61
---
 InCallUI/src/com/android/incallui/CallCardFragment.java  | 12 ++++++++++++
 InCallUI/src/com/android/incallui/CallCardPresenter.java |  4 ++++
 2 files changed, 16 insertions(+)

(limited to 'InCallUI/src/com/android/incallui')

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 2c0204c15..d880b973a 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -26,6 +26,7 @@ import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.widget.ImageView;
@@ -56,6 +57,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private ViewStub mSecondaryCallInfo;
     private TextView mSecondaryCallName;
     private ImageView mSecondaryPhoto;
+    private View mSecondaryPhotoOverlay;
 
     // Cached DisplayMetrics density.
     private float mDensity;
@@ -437,5 +439,15 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         if (mSecondaryPhoto == null) {
             mSecondaryPhoto = (ImageView) getView().findViewById(R.id.secondaryCallPhoto);
         }
+
+        if (mSecondaryPhotoOverlay == null) {
+            mSecondaryPhotoOverlay = getView().findViewById(R.id.dim_effect_for_secondary_photo);
+            mSecondaryPhotoOverlay.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    getPresenter().secondaryPhotoClicked();
+                }
+            });
+        }
     }
 }
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 5cb4219d4..f8343fea4 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -480,6 +480,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
         mAudioModeProvider.addListener(this);
     }
 
+    public void secondaryPhotoClicked() {
+        CallCommandClient.getInstance().swap();
+    }
+
     public interface CallCardUi extends Ui {
         void setVisible(boolean on);
         void setPrimary(String number, String name, boolean nameIsNumber, String label,
-- 
cgit v1.2.3