diff options
author | Tyler Gunn <tgunn@google.com> | 2016-05-18 20:43:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-18 20:43:06 +0000 |
commit | 0b44a54fa461e9848a2bf4c3bdb040d2cf151408 (patch) | |
tree | 62db3bb24485126fc33d5b88250b6eec5a37c71a | |
parent | 3e4292f30db7a5d38fc1021f8f3a9a9de8a92034 (diff) | |
parent | 5a210c306d9757c30d07c83ae962c32261c40cd8 (diff) |
Merge "IMS-VT: Trigger internal onStateChanged notification" into nyc-mr1-dev am: b15db3f15c
am: 5a210c306d
* commit '5a210c306d9757c30d07c83ae962c32261c40cd8':
IMS-VT: Trigger internal onStateChanged notification
Change-Id: Ib31adb5bd3d121a4c563b816ba3756cef0b5bd3b
-rw-r--r-- | InCallUI/src/com/android/incallui/VideoCallFragment.java | 5 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/VideoCallPresenter.java | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/VideoCallFragment.java b/InCallUI/src/com/android/incallui/VideoCallFragment.java index 2e65f81b4..6a46a423d 100644 --- a/InCallUI/src/com/android/incallui/VideoCallFragment.java +++ b/InCallUI/src/com/android/incallui/VideoCallFragment.java @@ -435,12 +435,11 @@ public class VideoCallFragment extends BaseFragment<VideoCallPresenter, */ @Override public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - mIsLandscape = getResources().getBoolean(R.bool.is_layout_landscape); - Log.d(this, "onActivityCreated: IsLandscape=" + mIsLandscape); getPresenter().init(getActivity()); + + super.onActivityCreated(savedInstanceState); } @Override diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java index 7617608d1..3494afa6d 100644 --- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java +++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java @@ -244,6 +244,10 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi InCallVideoCallCallbackNotifier.getInstance().addVideoEventListener(this); mCurrentVideoState = VideoProfile.STATE_AUDIO_ONLY; mCurrentCallState = Call.State.INVALID; + + final InCallPresenter.InCallState inCallState = + InCallPresenter.getInstance().getInCallState(); + onStateChange(inCallState, inCallState, CallList.getInstance()); } /** |