diff options
Diffstat (limited to 'java/com/android/dialer/callcomposer/CameraComposerFragment.java')
| -rw-r--r-- | java/com/android/dialer/callcomposer/CameraComposerFragment.java | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java index ecdc25822..1002b27b1 100644 --- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java +++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java @@ -91,17 +91,17 @@ public class CameraComposerFragment extends CallComposerFragment LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle bundle) { View root = inflater.inflate(R.layout.fragment_camera_composer, container, false); permissionView = root.findViewById(R.id.permission_view); - loading = (ProgressBar) root.findViewById(R.id.loading); - cameraView = (CameraMediaChooserView) root.findViewById(R.id.camera_view); + loading = root.findViewById(R.id.loading); + cameraView = root.findViewById(R.id.camera_view); shutter = cameraView.findViewById(R.id.camera_shutter_visual); - exitFullscreen = (ImageButton) cameraView.findViewById(R.id.camera_exit_fullscreen); - fullscreen = (ImageButton) cameraView.findViewById(R.id.camera_fullscreen); - swapCamera = (ImageButton) cameraView.findViewById(R.id.swap_camera_button); - capture = (ImageButton) cameraView.findViewById(R.id.camera_capture_button); - cancel = (ImageButton) cameraView.findViewById(R.id.camera_cancel_button); - focus = (RenderOverlay) cameraView.findViewById(R.id.focus_visual); - preview = (CameraPreviewHost) cameraView.findViewById(R.id.camera_preview); - previewImageView = (ImageView) root.findViewById(R.id.preview_image_view); + exitFullscreen = cameraView.findViewById(R.id.camera_exit_fullscreen); + fullscreen = cameraView.findViewById(R.id.camera_fullscreen); + swapCamera = cameraView.findViewById(R.id.swap_camera_button); + capture = cameraView.findViewById(R.id.camera_capture_button); + cancel = cameraView.findViewById(R.id.camera_cancel_button); + focus = cameraView.findViewById(R.id.focus_visual); + preview = cameraView.findViewById(R.id.camera_preview); + previewImageView = root.findViewById(R.id.preview_image_view); exitFullscreen.setOnClickListener(this); fullscreen.setOnClickListener(this); @@ -113,8 +113,8 @@ public class CameraComposerFragment extends CallComposerFragment if (!PermissionsUtil.hasCameraPermissions(getContext())) { LogUtil.i("CameraComposerFragment.onCreateView", "Permission view shown."); Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_DISPLAYED); - ImageView permissionImage = (ImageView) permissionView.findViewById(R.id.permission_icon); - TextView permissionText = (TextView) permissionView.findViewById(R.id.permission_text); + ImageView permissionImage = permissionView.findViewById(R.id.permission_icon); + TextView permissionText = permissionView.findViewById(R.id.permission_text); allowPermission = permissionView.findViewById(R.id.allow); allowPermission.setOnClickListener(this); @@ -345,6 +345,12 @@ public class CameraComposerFragment extends CallComposerFragment previewImageView.setVisibility(View.GONE); } + if (cameraDirection == CameraInfo.CAMERA_FACING_FRONT) { + swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_rear)); + } else { + swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_facing)); + } + if (cameraUri == null && isCameraAvailable) { CameraManager.get().resetPreview(); cancel.setVisibility(View.GONE); |