diff options
author | Yorke Lee <yorkelee@google.com> | 2015-03-17 14:28:21 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2015-03-20 10:50:12 -0700 |
commit | a42005350c1dd0aa956fe5f911f59e704b58c1c7 (patch) | |
tree | 13a1797e8b0e7d0415eea5ac1c0a630231280fcc | |
parent | 8f299d48242b85b8167a1e3de885f16a23fd522c (diff) |
DO NOT MERGE Don't hide caller photo for video call
Bug: 19728020
Change-Id: I6e5259c63553de9e5060621bcc749d1039b67ea1
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 10 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 9 |
2 files changed, 0 insertions, 19 deletions
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 @@ -788,16 +788,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. * * @param visible {@code true} if the UI should show the HD audio icon. diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 0464edff3..762d8688e 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -250,14 +250,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> getUi().showHdAudioIndicator(false); } - // Hide/show the contact photo based on the video state. - // If the primary call is a video call on hold, still show the contact photo. - // If the primary call is an active video call, hide the contact photo. - if (mPrimary != null) { - getUi().setPhotoVisible(!(mPrimary.isVideoCall(mContext) && - callState != Call.State.ONHOLD)); - } - maybeShowManageConferenceCallButton(); final boolean enableEndCallButton = Call.State.isConnectingOrConnected(callState) && @@ -794,7 +786,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> void setPrimaryLabel(String label); void setEndCallButtonEnabled(boolean enabled, boolean animate); void setCallbackNumber(String number, boolean isEmergencyCalls); - void setPhotoVisible(boolean isVisible); void setProgressSpinnerVisible(boolean visible); void showHdAudioIndicator(boolean visible); void showManageConferenceCallButton(boolean visible); |