diff options
author | Yorke Lee <yorkelee@google.com> | 2013-08-29 19:37:04 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2013-08-29 19:38:57 -0700 |
commit | 90995fcb6778a9cb6dc35be12aeb1a5d0dcbb5ae (patch) | |
tree | 00bf6da6e8d9f141b921bdec5f3381f9e2857eb9 /InCallUI/src/com/android/incallui | |
parent | 7569427c703ae89003317ee3e37dfa9e171d8abe (diff) |
Allow swapping calls by clicking on secondary call card
Bug: 9679473
Change-Id: I9e25a247c59530d257ece27e62c88329eb5f4f61
Diffstat (limited to 'InCallUI/src/com/android/incallui')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 12 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 4 |
2 files changed, 16 insertions, 0 deletions
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, |