diff options
author | Prerepa Viswanadham <dham@google.com> | 2015-05-04 16:46:24 -0700 |
---|---|---|
committer | Prerepa Viswanadham <dham@google.com> | 2015-05-04 16:46:24 -0700 |
commit | a0554ca0745788e230c5eaee9e8163433ce0b9cb (patch) | |
tree | e5d642612eabbe9fc6170b6d3b4b88d382b5350b | |
parent | 3fd12d54292f2ca80a18a7724f7fc66933e9692f (diff) | |
parent | 7fdc543855a81ed71e19c958bca2e6e0f4a5c106 (diff) |
Merge commit 'b1c7028' into merge_try2
Change-Id: I7cb5298c37e1f07f8b1b234605a211c6478963f0
3 files changed, 2 insertions, 11 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index ff9356be4..dc2d9c551 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -266,6 +266,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> } private void configureAnswerTargetsForSms(Call call, List<String> textMsgs) { + mHasTextMessages = textMsgs != null; boolean withSms = call.can(android.telecom.Call.Details.CAPABILITY_RESPOND_VIA_TEXT) && mHasTextMessages; diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index 2544c5f92..43ee3326b 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -79,6 +79,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto InCallPresenter.getInstance().removeIncomingCallListener(this); InCallPresenter.getInstance().removeDetailsListener(this); InCallPresenter.getInstance().getInCallCameraManager().removeCameraSelectionListener(this); + InCallPresenter.getInstance().removeCanAddCallListener(this); } @Override diff --git a/InCallUI/src/com/android/incallui/VideoCallFragment.java b/InCallUI/src/com/android/incallui/VideoCallFragment.java index b845bdf9c..6d70b4271 100644 --- a/InCallUI/src/com/android/incallui/VideoCallFragment.java +++ b/InCallUI/src/com/android/incallui/VideoCallFragment.java @@ -16,14 +16,10 @@ package com.android.incallui; -import android.content.Context; -import android.content.res.Resources; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.SurfaceTexture; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.telecom.VideoProfile; import android.view.Display; import android.view.LayoutInflater; import android.view.Surface; @@ -34,7 +30,6 @@ import android.view.ViewStub; import android.view.ViewTreeObserver; import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.Toast; import com.google.common.base.Objects; @@ -66,12 +61,6 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter, */ public static final int ORIENTATION_UNKNOWN = -1; - /** - * Invalid resource id. - */ - public static final int INVALID_RESOURCE_ID = -1; - - // Static storage used to retain the video surfaces across Activity restart. // TextureViews are not parcelable, so it is not possible to store them in the saved state. private static boolean sVideoSurfacesInUse = false; |