diff options
Diffstat (limited to 'java/com/android/incallui/answer/impl')
7 files changed, 436 insertions, 12 deletions
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 6874daea3..c6304c0fa 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -106,6 +106,9 @@ public class AnswerFragment extends Fragment @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) static final String ARG_IS_VIDEO_UPGRADE_REQUEST = "is_video_upgrade_request"; + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + static final String ARG_IS_SELF_MANAGED_CAMERA = "is_self_managed_camera"; + private static final String STATE_HAS_ANIMATED_ENTRY = "hasAnimated"; private static final int HINT_SECONDARY_SHOW_DURATION_MILLIS = 5000; @@ -288,11 +291,15 @@ public class AnswerFragment extends Fragment } public static AnswerFragment newInstance( - String callId, boolean isVideoCall, boolean isVideoUpgradeRequest) { + String callId, + boolean isVideoCall, + boolean isVideoUpgradeRequest, + boolean isSelfManagedCamera) { Bundle bundle = new Bundle(); bundle.putString(ARG_CALL_ID, Assert.isNotNull(callId)); bundle.putBoolean(ARG_IS_VIDEO_CALL, isVideoCall); bundle.putBoolean(ARG_IS_VIDEO_UPGRADE_REQUEST, isVideoUpgradeRequest); + bundle.putBoolean(ARG_IS_SELF_MANAGED_CAMERA, isSelfManagedCamera); AnswerFragment instance = new AnswerFragment(); instance.setArguments(bundle); @@ -347,10 +354,10 @@ public class AnswerFragment extends Fragment secondaryButton.setFocusable(AccessibilityUtil.isAccessibilityEnabled(getContext())); secondaryButton.setAccessibilityDelegate(accessibilityDelegate); - if (isVideoCall()) { - secondaryButton.setVisibility(View.VISIBLE); - } else { + if (isVideoUpgradeRequest()) { secondaryButton.setVisibility(View.INVISIBLE); + } else if (isVideoCall()) { + secondaryButton.setVisibility(View.VISIBLE); } } @@ -620,7 +627,11 @@ public class AnswerFragment extends Fragment view.setSystemUiVisibility(flags); if (isVideoCall() || isVideoUpgradeRequest()) { if (VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) { - answerVideoCallScreen = new AnswerVideoCallScreen(getCallId(), this, view); + if (isSelfManagedCamera()) { + answerVideoCallScreen = new SelfManagedAnswerVideoCallScreen(getCallId(), this, view); + } else { + answerVideoCallScreen = new AnswerVideoCallScreen(getCallId(), this, view); + } } else { view.findViewById(R.id.videocall_video_off).setVisibility(View.VISIBLE); } @@ -718,6 +729,10 @@ public class AnswerFragment extends Fragment return getArguments().getBoolean(ARG_IS_VIDEO_CALL); } + public boolean isSelfManagedCamera() { + return getArguments().getBoolean(ARG_IS_SELF_MANAGED_CAMERA); + } + @Override public void onAnswerProgressUpdate(@FloatRange(from = -1f, to = 1f) float answerProgress) { // Don't fade the window background for call waiting or video upgrades. Fading the background diff --git a/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java b/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java new file mode 100644 index 000000000..ad7d94d95 --- /dev/null +++ b/java/com/android/incallui/answer/impl/FixedAspectSurfaceView.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.incallui.answer.impl; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.SurfaceView; +import android.view.View; +import com.android.dialer.common.Assert; + +/** + * A SurfaceView that maintains its aspect ratio to be a desired target value. + * + * <p>The FixedAspectSurfaceView will not be able to maintain the requested aspect ratio if both the + * width and the height are exactly determined by the layout. To avoid this, ensure that either the + * height or the width is adjustable by the view; for example, by setting the layout parameters to + * be WRAP_CONTENT for the dimension that is best adjusted to maintain the aspect ratio. + */ +public class FixedAspectSurfaceView extends SurfaceView { + + /** Desired width/height ratio */ + private float mAspectRatio; + + private final boolean scaleWidth; + private final boolean scaleHeight; + + public FixedAspectSurfaceView(Context context, AttributeSet attrs) { + super(context, attrs); + + // Get initial aspect ratio from custom attributes + TypedArray a = + context.getTheme().obtainStyledAttributes(attrs, R.styleable.FixedAspectSurfaceView, 0, 0); + scaleHeight = a.getBoolean(R.styleable.FixedAspectSurfaceView_scaleHeight, false); + scaleWidth = a.getBoolean(R.styleable.FixedAspectSurfaceView_scaleWidth, false); + Assert.checkArgument(scaleHeight != scaleWidth, "Must either scale width or height"); + setAspectRatio(a.getFloat(R.styleable.FixedAspectSurfaceView_aspectRatio, 1.f)); + a.recycle(); + } + + /** + * Set the desired aspect ratio for this view. + * + * @param aspect the desired width/height ratio in the current UI orientation. Must be a positive + * value. + */ + public void setAspectRatio(float aspect) { + Assert.checkArgument(aspect >= 0, "Aspect ratio must be positive"); + mAspectRatio = aspect; + requestLayout(); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + int width = MeasureSpec.getSize(widthMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + + // Do the scaling + if (scaleWidth) { + width = (int) (height * mAspectRatio); + } else if (scaleHeight) { + height = (int) (width / mAspectRatio); + } + + // Override width/height if needed for EXACTLY and AT_MOST specs + width = View.resolveSizeAndState(width, widthMeasureSpec, 0); + height = View.resolveSizeAndState(height, heightMeasureSpec, 0); + + // Finally set the calculated dimensions + setMeasuredDimension(width, height); + } +} diff --git a/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java b/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java new file mode 100644 index 000000000..522d77235 --- /dev/null +++ b/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java @@ -0,0 +1,268 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.incallui.answer.impl; + +import android.content.Context; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.CameraCaptureSession; +import android.hardware.camera2.CameraCharacteristics; +import android.hardware.camera2.CameraDevice; +import android.hardware.camera2.CameraDevice.StateCallback; +import android.hardware.camera2.CameraManager; +import android.hardware.camera2.CameraMetadata; +import android.hardware.camera2.CaptureRequest; +import android.hardware.camera2.params.StreamConfigurationMap; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.util.Size; +import android.view.Surface; +import android.view.SurfaceHolder; +import android.view.SurfaceView; +import android.view.View; +import com.android.dialer.common.Assert; +import com.android.dialer.common.LogUtil; +import com.android.incallui.video.protocol.VideoCallScreen; +import java.util.Arrays; + +/** + * Shows the local preview for the incoming video call or video upgrade request. This class is used + * for RCS Video Share where we need to open the camera preview ourselves. For IMS Video the camera + * is managed by the modem, see {@link AnswerVideoCallScreen}. + */ +public class SelfManagedAnswerVideoCallScreen extends StateCallback implements VideoCallScreen { + + private static final int MAX_WIDTH = 1920; + private static final float ASPECT_TOLERANCE = 0.1f; + private static final float TARGET_ASPECT = 16.f / 9.f; + + @NonNull private final String callId; + @NonNull private final Fragment fragment; + @NonNull private final FixedAspectSurfaceView surfaceView; + private final Context context; + + private String cameraId; + private CameraDevice camera; + private CaptureRequest.Builder captureRequestBuilder; + + public SelfManagedAnswerVideoCallScreen( + @NonNull String callId, @NonNull Fragment fragment, @NonNull View view) { + this.callId = Assert.isNotNull(callId); + this.fragment = Assert.isNotNull(fragment); + this.context = Assert.isNotNull(fragment.getContext()); + + surfaceView = + Assert.isNotNull( + (FixedAspectSurfaceView) view.findViewById(R.id.incoming_preview_surface_view)); + surfaceView.setVisibility(View.VISIBLE); + view.findViewById(R.id.incoming_preview_texture_view_overlay).setVisibility(View.VISIBLE); + view.setBackgroundColor(0xff000000); + } + + @Override + public void onVideoScreenStart() { + openCamera(); + } + + @Override + public void onVideoScreenStop() { + closeCamera(); + } + + @Override + public void showVideoViews( + boolean shouldShowPreview, boolean shouldShowRemote, boolean isRemotelyHeld) {} + + @Override + public void onLocalVideoDimensionsChanged() {} + + @Override + public void onLocalVideoOrientationChanged() {} + + @Override + public void onRemoteVideoDimensionsChanged() {} + + @Override + public void updateFullscreenAndGreenScreenMode( + boolean shouldShowFullscreen, boolean shouldShowGreenScreen) {} + + @Override + public Fragment getVideoCallScreenFragment() { + return fragment; + } + + @Override + public String getCallId() { + return callId; + } + + /** + * Opens the first front facing camera on the device into a {@link SurfaceView} while preserving + * aspect ratio. + */ + private void openCamera() { + CameraManager manager = context.getSystemService(CameraManager.class); + + StreamConfigurationMap configMap = getFrontFacingCameraSizes(manager); + if (configMap == null) { + return; + } + + Size previewSize = getOptimalSize(configMap.getOutputSizes(SurfaceHolder.class)); + LogUtil.i("SelfManagedAnswerVideoCallScreen.openCamera", "Optimal size: " + previewSize); + float outputAspect = (float) previewSize.getWidth() / previewSize.getHeight(); + surfaceView.setAspectRatio(outputAspect); + surfaceView.getHolder().setFixedSize(previewSize.getWidth(), previewSize.getHeight()); + + try { + manager.openCamera(cameraId, this, null); + } catch (CameraAccessException e) { + LogUtil.e("SelfManagedAnswerVideoCallScreen.openCamera", "failed to open camera", e); + } + } + + @Nullable + private StreamConfigurationMap getFrontFacingCameraSizes(CameraManager manager) { + String[] cameraIds; + try { + cameraIds = manager.getCameraIdList(); + } catch (CameraAccessException e) { + LogUtil.e( + "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes", + "failed to get camera ids", + e); + return null; + } + + for (String cameraId : cameraIds) { + CameraCharacteristics characteristics; + try { + characteristics = manager.getCameraCharacteristics(cameraId); + } catch (CameraAccessException e) { + LogUtil.e( + "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes", + "failed to get camera characteristics", + e); + continue; + } + + if (characteristics.get(CameraCharacteristics.LENS_FACING) + != CameraCharacteristics.LENS_FACING_FRONT) { + continue; + } + + StreamConfigurationMap configMap = + characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); + if (configMap == null) { + continue; + } + + this.cameraId = cameraId; + return configMap; + } + LogUtil.e( + "SelfManagedAnswerVideoCallScreen.getFrontFacingCameraSizes", "No valid configurations."); + return null; + } + + /** + * Given an array of {@link Size}s, tries to find the largest Size such that the aspect ratio of + * the returned size is within {@code ASPECT_TOLERANCE} of {@code TARGET_ASPECT}. This is useful + * because it provides us with an adequate size/camera resolution that will experience the least + * stretching from our fullscreen UI that doesn't match any of the camera sizes. + */ + private static Size getOptimalSize(Size[] outputSizes) { + Size bestCandidateSize = outputSizes[0]; + float bestCandidateAspect = + (float) bestCandidateSize.getWidth() / bestCandidateSize.getHeight(); + + for (Size candidateSize : outputSizes) { + if (candidateSize.getWidth() < MAX_WIDTH) { + float candidateAspect = (float) candidateSize.getWidth() / candidateSize.getHeight(); + boolean isGoodCandidateAspect = + Math.abs(candidateAspect - TARGET_ASPECT) < ASPECT_TOLERANCE; + boolean isGoodOutputAspect = + Math.abs(bestCandidateAspect - TARGET_ASPECT) < ASPECT_TOLERANCE; + + if ((isGoodCandidateAspect && !isGoodOutputAspect) + || candidateSize.getWidth() > bestCandidateSize.getWidth()) { + bestCandidateSize = candidateSize; + bestCandidateAspect = candidateAspect; + } + } + } + return bestCandidateSize; + } + + @Override + public void onOpened(CameraDevice camera) { + LogUtil.i("SelfManagedAnswerVideoCallScreen.opOpened", "camera opened."); + this.camera = camera; + Surface surface = surfaceView.getHolder().getSurface(); + try { + captureRequestBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW); + captureRequestBuilder.addTarget(surface); + camera.createCaptureSession(Arrays.asList(surface), new CaptureSessionCallback(), null); + } catch (CameraAccessException e) { + LogUtil.e( + "SelfManagedAnswerVideoCallScreen.createCameraPreview", "failed to create preview", e); + } + } + + @Override + public void onDisconnected(CameraDevice camera) { + closeCamera(); + } + + @Override + public void onError(CameraDevice camera, int error) { + closeCamera(); + } + + private void closeCamera() { + if (camera != null) { + camera.close(); + camera = null; + } + } + + private class CaptureSessionCallback extends CameraCaptureSession.StateCallback { + + @Override + public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) { + LogUtil.i( + "SelfManagedAnswerVideoCallScreen.onConfigured", "camera capture session configured."); + // The camera is already closed. + if (camera == null) { + return; + } + + // When the session is ready, we start displaying the preview. + captureRequestBuilder.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO); + try { + cameraCaptureSession.setRepeatingRequest(captureRequestBuilder.build(), null, null); + } catch (CameraAccessException e) { + LogUtil.e("CaptureSessionCallback.onConfigured", "failed to configure", e); + } + } + + @Override + public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) { + LogUtil.e("CaptureSessionCallback.onConfigureFailed", "failed to configure"); + } + } +} diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml index aa153dd4b..042e7b82f 100644 --- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml +++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml @@ -14,7 +14,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - <com.android.incallui.answer.impl.AffordanceHolderLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" @@ -27,11 +26,20 @@ android:keepScreenOn="true"> <TextureView - android:id="@+id/incoming_preview_texture_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:importantForAccessibility="no" - android:visibility="gone"/> + android:id="@+id/incoming_preview_texture_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:importantForAccessibility="no" + android:visibility="gone"/> + + <com.android.incallui.answer.impl.FixedAspectSurfaceView + android:id="@+id/incoming_preview_surface_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:importantForAccessibility="no" + android:visibility="gone" + app:scaleWidth="@bool/scale_width" + app:scaleHeight="@bool/scale_height"/> <View android:id="@+id/incoming_preview_texture_view_overlay" diff --git a/java/com/android/incallui/answer/impl/res/values-land/dimens.xml b/java/com/android/incallui/answer/impl/res/values-land/dimens.xml new file mode 100644 index 000000000..5e2a88ae9 --- /dev/null +++ b/java/com/android/incallui/answer/impl/res/values-land/dimens.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<resources> + <bool name="scale_width">false</bool> + <bool name="scale_height">true</bool> +</resources> diff --git a/java/com/android/incallui/answer/impl/res/values/attrs.xml b/java/com/android/incallui/answer/impl/res/values/attrs.xml new file mode 100644 index 000000000..1086e1ca5 --- /dev/null +++ b/java/com/android/incallui/answer/impl/res/values/attrs.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <declare-styleable name="FixedAspectSurfaceView"> + <attr name="aspectRatio" format="float" /> + <attr name="scaleWidth" format="boolean"/> + <attr name="scaleHeight" format="boolean"/> + </declare-styleable> + + <item name="match_parent" type="dimen">-1</item> + <item name="wrap_content" type="dimen">-2</item> +</resources>
\ No newline at end of file diff --git a/java/com/android/incallui/answer/impl/res/values/dimens.xml b/java/com/android/incallui/answer/impl/res/values/dimens.xml index 8329707a6..50aec0328 100644 --- a/java/com/android/incallui/answer/impl/res/values/dimens.xml +++ b/java/com/android/incallui/answer/impl/res/values/dimens.xml @@ -14,7 +14,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - <resources> <dimen name="answer_contact_name_text_size">24sp</dimen> <dimen name="answer_contact_name_min_size">24sp</dimen> @@ -22,5 +21,7 @@ <dimen name="answer_avatar_size">0dp</dimen> <dimen name="answer_importance_margin_bottom">0dp</dimen> <bool name="answer_important_call_allowed">false</bool> + <bool name="scale_width">true</bool> + <bool name="scale_height">false</bool> <integer name="answer_animate_entry_millis">1000</integer> </resources> |