diff options
author | Evan Charlton <evanc@google.com> | 2014-05-14 11:08:04 -0700 |
---|---|---|
committer | Evan Charlton <evanc@google.com> | 2014-05-14 11:16:26 -0700 |
commit | bbec33053cc35ad5af0fa48d9e8f77644433be6f (patch) | |
tree | 841f4494ee4d2e32a6a064caa29e5bd0636524c3 | |
parent | 486407a63a0570a4fa2e93603100db30664441db (diff) | |
parent | 4d611662e17878203be2770142409829c1a2d4e4 (diff) |
resolved conflicts for merge of 500e399c to master
Change-Id: I7cc16e713bb142450c7689942097110bde404b54
-rw-r--r-- | InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png | bin | 1857 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-hdpi/ic_in_call_wifi.png | bin | 1789 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/ic_in_call_video_handoff.png | bin | 1508 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-mdpi/ic_in_call_wifi.png | bin | 1487 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/ic_in_call_video_handoff.png | bin | 2180 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png | bin | 2283 -> 0 bytes | |||
-rw-r--r-- | InCallUI/res/drawable-xxhdpi/ic_in_call_video_handoff.png | bin | 2244 -> 0 bytes | |||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonFragment.java | 3 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 3 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 15 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 9 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCommandClient.java | 25 |
12 files changed, 1 insertions, 54 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index fb76e3c69..000000000 --- a/InCallUI/res/drawable-hdpi/ic_in_call_video_handoff.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png Binary files differdeleted file mode 100644 index 93e086dab..000000000 --- a/InCallUI/res/drawable-hdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-mdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index 8b1ff4e02..000000000 --- a/InCallUI/res/drawable-mdpi/ic_in_call_video_handoff.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png Binary files differdeleted file mode 100644 index 339d4ed27..000000000 --- a/InCallUI/res/drawable-mdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-xhdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index 38d6220b1..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_in_call_video_handoff.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png b/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png Binary files differdeleted file mode 100644 index 692726fbe..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_in_call_wifi.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_video_handoff.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_video_handoff.png Binary files differdeleted file mode 100644 index 4cbdbbb57..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_in_call_video_handoff.png +++ /dev/null diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index 38e8f5eab..d9fc68de3 100644 --- a/InCallUI/src/com/android/incallui/CallButtonFragment.java +++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java @@ -183,9 +183,6 @@ public class CallButtonFragment case R.id.auxiliaryActionButton: getPresenter().auxiliaryActionButtonClicked(); break; - case R.id.videoHandoffButton: - getPresenter().videoHandoffClicked(); - break; default: Log.wtf(this, "onClick: unexpected"); break; diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index 6cf05d099..dc5eda1c3 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -257,12 +257,12 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto Log.v(this, "Show swap ", call.can(Capabilities.SWAP_CALLS)); Log.v(this, "Show add call ", call.can(Capabilities.ADD_CALL)); Log.v(this, "Show mute ", call.can(Capabilities.MUTE)); - Log.v(this, "Show video handoff ", call.can(Capabilities.VIDEO_HANDOFF)); final boolean canMerge = call.can(Capabilities.MERGE_CALLS); final boolean canAdd = call.can(Capabilities.ADD_CALL); final boolean isGenericConference = call.can(Capabilities.GENERIC_CONFERENCE); + final boolean showMerge = !isGenericConference && canMerge; if (showMerge) { @@ -309,7 +309,6 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto } ui.enableMute(call.can(Capabilities.MUTE)); - ui.showVideoHandoff(call.can(Capabilities.VIDEO_HANDOFF)); // Finally, update the "extra button row": It's displayed above the // "End" button, but only if necessary. Also, it's never displayed diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index bc4fb1196..9f14e265d 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -28,7 +28,6 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.ViewStub; import android.view.accessibility.AccessibilityEvent; -import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; @@ -51,7 +50,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr private TextView mCallTypeLabel; private ImageView mPhoto; private TextView mElapsedTime; - private Button mConnectionHandoffButton; // Secondary caller info private ViewStub mSecondaryCallInfo; @@ -120,14 +118,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } }); ViewUtil.setupFloatingActionButton(mEndCallButton, getResources()); - - mConnectionHandoffButton = (Button) view.findViewById(R.id.connectionHandoffButton); - mConnectionHandoffButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - getPresenter().connectionHandoffClicked(); - } - }); } @Override @@ -187,11 +177,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } @Override - public void setShowConnectionHandoff(boolean showConnectionHandoff) { - mConnectionHandoffButton.setVisibility(showConnectionHandoff ? View.VISIBLE : View.GONE); - } - - @Override public void setPrimary(String number, String name, boolean nameIsNumber, String label, Drawable photo, boolean isConference, boolean isGeneric, boolean isSipCall) { Log.d(this, "Setting primary call"); diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index e8c88c7bf..42723399e 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -200,8 +200,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> final boolean enableEndCallButton = state.isConnectingOrConnected() && !state.isIncoming() && mPrimary != null; ui.setEndCallButtonEnabled(enableEndCallButton); - ui.setShowConnectionHandoff(mPrimary != null && mPrimary.can( - Capabilities.CONNECTION_HANDOFF)); } @Override @@ -476,12 +474,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> CallCommandClient.getInstance().disconnectCall(mPrimary.getCallId()); } - public void connectionHandoffClicked() { - if (mPrimary != null) { - CallCommandClient.getInstance().connectionHandoff(mPrimary.getCallId()); - } - } - public interface CallCardUi extends Ui { void setVisible(boolean on); void setPrimary(String number, String name, boolean nameIsNumber, String label, @@ -497,6 +489,5 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> void setPrimaryPhoneNumber(String phoneNumber); void setPrimaryLabel(String label); void setEndCallButtonEnabled(boolean enabled); - void setShowConnectionHandoff(boolean showConnectionHandoff); } } diff --git a/InCallUI/src/com/android/incallui/CallCommandClient.java b/InCallUI/src/com/android/incallui/CallCommandClient.java index 234c518de..52d2100c8 100644 --- a/InCallUI/src/com/android/incallui/CallCommandClient.java +++ b/InCallUI/src/com/android/incallui/CallCommandClient.java @@ -243,29 +243,4 @@ public class CallCommandClient { } } - public void videoHandoff(int callId) { - Log.i(this, "video handoff"); - if (mCommandService == null) { - Log.e(this, "Cannot perform video handoff; CallCommandService == null"); - return; - } - try { - mCommandService.videoHandoff(callId); - } catch (RemoteException e) { - Log.e(this, "Error performing video handoff.", e); - } - } - - public void connectionHandoff(int callId) { - Log.i(this, "connection handoff"); - if (mCommandService == null) { - Log.e(this, "Cannot perform connection handoff; CallCommandService == null"); - return; - } - try { - mCommandService.connectionHandoff(callId); - } catch (RemoteException e) { - Log.e(this, "Error performing connection handoff.", e); - } - } } |