diff options
| author | linyuh <linyuh@google.com> | 2018-03-26 12:46:18 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-26 22:23:52 -0700 |
| commit | 437ae9552cce7768068fa92663740711ee541417 (patch) | |
| tree | 1ae9af42ed23c09404b87ca613247e18c3fa10d2 /java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java | |
| parent | cf14ecbc3cb604804ae1f9d01e47444fcf0eedc6 (diff) | |
Remove obsolete version checks and compat utilities after min SDK was bumped up to N.
Test: Existing tests
PiperOrigin-RevId: 190508397
Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193
Diffstat (limited to 'java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java')
| -rw-r--r-- | java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java index b97d2eb16..f270edab9 100644 --- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java +++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java @@ -50,7 +50,6 @@ import android.widget.TextView; import com.android.dialer.common.Assert; import com.android.dialer.common.FragmentUtils; import com.android.dialer.common.LogUtil; -import com.android.dialer.compat.ActivityCompat; import com.android.dialer.util.PermissionsUtil; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment; import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter; @@ -187,8 +186,7 @@ public class SurfaceViewVideoCallFragment extends Fragment new ContactGridManager(view, null /* no avatar */, 0, false /* showAnonymousAvatar */); controls = view.findViewById(R.id.videocall_video_controls); - controls.setVisibility( - ActivityCompat.isInMultiWindowMode(getActivity()) ? View.GONE : View.VISIBLE); + controls.setVisibility(getActivity().isInMultiWindowMode() ? View.GONE : View.VISIBLE); controlsContainer = view.findViewById(R.id.videocall_video_controls_container); speakerButton = (CheckableImageButton) view.findViewById(R.id.videocall_speaker_button); muteButton = (CheckableImageButton) view.findViewById(R.id.videocall_mute_button); @@ -200,8 +198,7 @@ public class SurfaceViewVideoCallFragment extends Fragment swapCameraButton = (ImageButton) view.findViewById(R.id.videocall_switch_video); swapCameraButton.setOnClickListener(this); view.findViewById(R.id.videocall_switch_controls) - .setVisibility( - ActivityCompat.isInMultiWindowMode(getActivity()) ? View.GONE : View.VISIBLE); + .setVisibility(getActivity().isInMultiWindowMode() ? View.GONE : View.VISIBLE); switchOnHoldButton = view.findViewById(R.id.videocall_switch_on_hold); onHoldContainer = view.findViewById(R.id.videocall_on_hold_banner); remoteVideoOff = (TextView) view.findViewById(R.id.videocall_remote_video_off); @@ -478,7 +475,7 @@ public class SurfaceViewVideoCallFragment extends Fragment private Point getPreviewOffsetStartShown() { // No insets in multiwindow mode, and rootWindowInsets will get the display's insets. - if (ActivityCompat.isInMultiWindowMode(getActivity())) { + if (getActivity().isInMultiWindowMode()) { return new Point(); } if (isLandscape()) { @@ -690,7 +687,7 @@ public class SurfaceViewVideoCallFragment extends Fragment isInGreenScreenMode = shouldShowGreenScreen; isInFullscreenMode = shouldShowFullscreen; - if (getView().isAttachedToWindow() && !ActivityCompat.isInMultiWindowMode(getActivity())) { + if (getView().isAttachedToWindow() && !getActivity().isInMultiWindowMode()) { controlsContainer.onApplyWindowInsets(getView().getRootWindowInsets()); } if (shouldShowGreenScreen) { |