Update Dialer source to latest internal Google revision.

Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.

The Dialer team is now switching to a public development model similar
to the telephony team.

This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.

Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436

103 files changed, 1471 insertions, 535 deletions

diff --git a/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java b/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java
deleted file mode 100644
index 9e5ab3c5e..000000000
--- a/java/com/android/incallui/video/impl/CameraPermissionDialogFragment.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2016 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.video.impl;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import com.android.dialer.common.FragmentUtils;
-
-/** Dialog fragment to ask for camera permission from user. */
-public class CameraPermissionDialogFragment extends DialogFragment {
-
-  static CameraPermissionDialogFragment newInstance() {
-    CameraPermissionDialogFragment fragment = new CameraPermissionDialogFragment();
-    return fragment;
-  }
-
-  @NonNull
-  @Override
-  public Dialog onCreateDialog(Bundle bundle) {
-    return new AlertDialog.Builder(getContext())
-        .setTitle(R.string.camera_permission_dialog_title)
-        .setMessage(R.string.camera_permission_dialog_message)
-        .setPositiveButton(
-            R.string.camera_permission_dialog_positive_button,
-            new DialogInterface.OnClickListener() {
-              @Override
-              public void onClick(DialogInterface dialog, int which) {
-                CameraPermissionDialogCallback fragment =
-                    FragmentUtils.getParentUnsafe(
-                        CameraPermissionDialogFragment.this, CameraPermissionDialogCallback.class);
-                fragment.onCameraPermissionGranted();
-              }
-            })
-        .setNegativeButton(
-            R.string.camera_permission_dialog_negative_button,
-            new DialogInterface.OnClickListener() {
-              @Override
-              public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-              }
-            })
-        .create();
-  }
-
-  /** Callback for being granted camera permission. */
-  public interface CameraPermissionDialogCallback {
-    void onCameraPermissionGranted();
-  }
-}
diff --git a/java/com/android/incallui/video/impl/SpeakerButtonController.java b/java/com/android/incallui/video/impl/SpeakerButtonController.java
index e12032abf..d98545feb 100644
--- a/java/com/android/incallui/video/impl/SpeakerButtonController.java
+++ b/java/com/android/incallui/video/impl/SpeakerButtonController.java
@@ -88,7 +88,7 @@ public class SpeakerButtonController implements OnCheckedChangeListener, OnClick
         icon = R.drawable.quantum_ic_headset_white_36;
         contentDescriptionResId = R.string.incall_content_description_headset;
       } else {
-        icon = R.drawable.ic_phone_audio_white_36dp;
+        icon = R.drawable.quantum_ic_phone_in_talk_white_36;
         contentDescriptionResId = R.string.incall_content_description_earpiece;
       }
     } else {
diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
index b7a960e35..95bdd6b78 100644
--- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
@@ -50,6 +50,7 @@ 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;
 import com.android.incallui.contactgrid.ContactGridManager;
@@ -65,7 +66,6 @@ import com.android.incallui.incall.protocol.InCallScreenDelegateFactory;
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
-import com.android.incallui.video.impl.CameraPermissionDialogFragment.CameraPermissionDialogCallback;
 import com.android.incallui.video.impl.CheckableImageButton.OnCheckedChangeListener;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -85,15 +85,12 @@ public class SurfaceViewVideoCallFragment extends Fragment
         OnClickListener,
         OnCheckedChangeListener,
         AudioRouteSelectorPresenter,
-        OnSystemUiVisibilityChangeListener,
-        CameraPermissionDialogCallback {
+        OnSystemUiVisibilityChangeListener {
 
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_CALL_ID = "call_id";
 
   private static final int CAMERA_PERMISSION_REQUEST_CODE = 1;
-  private static final String CAMERA_PERMISSION_DIALOG_FRAMENT_TAG =
-      "CameraPermissionDialogFragment";
   private static final long CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS = 2000L;
   private static final long VIDEO_OFF_VIEW_FADE_OUT_DELAY_IN_MILLIS = 2000L;
 
@@ -131,7 +128,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
       new Runnable() {
         @Override
         public void run() {
-          if (videoCallScreenDelegate.shouldShowCameraPermissionDialog()) {
+          if (videoCallScreenDelegate.shouldShowCameraPermissionToast()) {
             LogUtil.i(
                 "SurfaceViewVideoCallFragment.cameraPermissionDialogRunnable", "showing dialog");
             checkCameraPermission();
@@ -495,7 +492,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   }
 
   private View[] getAllPreviewRelatedViews() {
-    return new View[] {previewRoot};
+    return new View[] {previewRoot, mutePreviewOverlay};
   }
 
   private int getOffsetTop(View view) {
@@ -612,7 +609,7 @@ public class SurfaceViewVideoCallFragment extends Fragment
   @Override
   public void onCheckedChanged(CheckableImageButton button, boolean isChecked) {
     if (button == cameraOffButton) {
-      if (!isChecked && !VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+      if (!isChecked && !VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
         LogUtil.i("SurfaceViewVideoCallFragment.onCheckedChanged", "show camera permission dialog");
         checkCameraPermission();
       } else {
@@ -644,12 +641,6 @@ public class SurfaceViewVideoCallFragment extends Fragment
     updateVideoOffViews();
   }
 
-  /**
-   * This method scales the video feed inside the texture view, it doesn't change the texture view's
-   * size. In the old UI we would change the view size to match the aspect ratio of the video. In
-   * the new UI the view is always square (with the circular clip) so we have to do additional work
-   * to make sure the non-square video doesn't look squished.
-   */
   @Override
   public void onLocalVideoDimensionsChanged() {
     LogUtil.i("SurfaceViewVideoCallFragment.onLocalVideoDimensionsChanged", null);
@@ -834,6 +825,9 @@ public class SurfaceViewVideoCallFragment extends Fragment
   }
 
   @Override
+  public void onAudioRouteSelectorDismiss() {}
+
+  @Override
   public void setPrimary(@NonNull PrimaryInfo primaryInfo) {
     LogUtil.i("SurfaceViewVideoCallFragment.setPrimary", primaryInfo.toString());
     contactGridManager.setPrimary(primaryInfo);
@@ -1051,24 +1045,19 @@ public class SurfaceViewVideoCallFragment extends Fragment
     }
   }
 
-  @Override
-  public void onCameraPermissionGranted() {
-    videoCallScreenDelegate.onCameraPermissionGranted();
-  }
-
   private void checkCameraPermission() {
     // Checks if user has consent of camera permission and the permission is granted.
     // If camera permission is revoked, shows system permission dialog.
     // If camera permission is granted but user doesn't have consent of camera permission
     // (which means it's first time making video call), shows custom dialog instead. This
     // will only be shown to user once.
-    if (!VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+    if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
       videoCallScreenDelegate.onCameraPermissionDialogShown();
       if (!VideoUtils.hasCameraPermission(getContext())) {
         requestPermissions(new String[] {permission.CAMERA}, CAMERA_PERMISSION_REQUEST_CODE);
       } else {
-        CameraPermissionDialogFragment.newInstance()
-            .show(getChildFragmentManager(), CAMERA_PERMISSION_DIALOG_FRAMENT_TAG);
+        PermissionsUtil.showCameraPermissionToast(getContext());
+        videoCallScreenDelegate.onCameraPermissionGranted();
       }
     }
   }
diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java
index 8e2f5aefd..b0beb77c1 100644
--- a/java/com/android/incallui/video/impl/VideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/VideoCallFragment.java
@@ -44,11 +44,11 @@ import android.view.Surface;
 import android.view.TextureView;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.View.OnLayoutChangeListener;
 import android.view.View.OnSystemUiVisibilityChangeListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.ViewOutlineProvider;
-import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Interpolator;
@@ -60,6 +60,7 @@ 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;
 import com.android.incallui.contactgrid.ContactGridManager;
@@ -75,7 +76,6 @@ import com.android.incallui.incall.protocol.InCallScreenDelegateFactory;
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.incall.protocol.SecondaryInfo;
-import com.android.incallui.video.impl.CameraPermissionDialogFragment.CameraPermissionDialogCallback;
 import com.android.incallui.video.impl.CheckableImageButton.OnCheckedChangeListener;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -93,21 +93,18 @@ public class VideoCallFragment extends Fragment
         OnClickListener,
         OnCheckedChangeListener,
         AudioRouteSelectorPresenter,
-        OnSystemUiVisibilityChangeListener,
-        CameraPermissionDialogCallback {
+        OnSystemUiVisibilityChangeListener {
 
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_CALL_ID = "call_id";
 
-  private static final float BLUR_PREVIEW_RADIUS = 16.0f;
-  private static final float BLUR_PREVIEW_SCALE_FACTOR = 1.0f;
+  @VisibleForTesting static final float BLUR_PREVIEW_RADIUS = 16.0f;
+  @VisibleForTesting static final float BLUR_PREVIEW_SCALE_FACTOR = 1.0f;
   private static final float BLUR_REMOTE_RADIUS = 25.0f;
   private static final float BLUR_REMOTE_SCALE_FACTOR = 0.25f;
   private static final float ASPECT_RATIO_MATCH_THRESHOLD = 0.2f;
 
   private static final int CAMERA_PERMISSION_REQUEST_CODE = 1;
-  private static final String CAMERA_PERMISSION_DIALOG_FRAMENT_TAG =
-      "CameraPermissionDialogFragment";
   private static final long CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS = 2000L;
   private static final long VIDEO_OFF_VIEW_FADE_OUT_DELAY_IN_MILLIS = 2000L;
 
@@ -121,6 +118,7 @@ public class VideoCallFragment extends Fragment
           outline.setOval(x - radius, y - radius, x + radius, y + radius);
         }
       };
+
   private InCallScreenDelegate inCallScreenDelegate;
   private VideoCallScreenDelegate videoCallScreenDelegate;
   private InCallButtonUiDelegate inCallButtonUiDelegate;
@@ -156,7 +154,7 @@ public class VideoCallFragment extends Fragment
       new Runnable() {
         @Override
         public void run() {
-          if (videoCallScreenDelegate.shouldShowCameraPermissionDialog()) {
+          if (videoCallScreenDelegate.shouldShowCameraPermissionToast()) {
             LogUtil.i("VideoCallFragment.cameraPermissionDialogRunnable", "showing dialog");
             checkCameraPermission();
           }
@@ -252,25 +250,43 @@ public class VideoCallFragment extends Fragment
     greenScreenBackgroundView = view.findViewById(R.id.videocall_green_screen_background);
     fullscreenBackgroundView = view.findViewById(R.id.videocall_fullscreen_background);
 
-    // We need the texture view size to be able to scale the remote video. At this point the view
-    // layout won't be complete so add a layout listener.
-    ViewTreeObserver observer = remoteTextureView.getViewTreeObserver();
-    observer.addOnGlobalLayoutListener(
-        new ViewTreeObserver.OnGlobalLayoutListener() {
+    remoteTextureView.addOnLayoutChangeListener(
+        new OnLayoutChangeListener() {
           @Override
-          public void onGlobalLayout() {
-            LogUtil.i("VideoCallFragment.onGlobalLayout", null);
+          public void onLayoutChange(
+              View v,
+              int left,
+              int top,
+              int right,
+              int bottom,
+              int oldLeft,
+              int oldTop,
+              int oldRight,
+              int oldBottom) {
+            LogUtil.i("VideoCallFragment.onLayoutChange", "remoteTextureView layout changed");
             updateRemoteVideoScaling();
-            updatePreviewVideoScaling();
-            updateVideoOffViews();
-            // Remove the listener so we don't continually re-layout.
-            ViewTreeObserver observer = remoteTextureView.getViewTreeObserver();
-            if (observer.isAlive()) {
-              observer.removeOnGlobalLayoutListener(this);
-            }
+            updateRemoteOffView();
           }
         });
 
+    previewTextureView.addOnLayoutChangeListener(
+        new OnLayoutChangeListener() {
+          @Override
+          public void onLayoutChange(
+              View v,
+              int left,
+              int top,
+              int right,
+              int bottom,
+              int oldLeft,
+              int oldTop,
+              int oldRight,
+              int oldBottom) {
+            LogUtil.i("VideoCallFragment.onLayoutChange", "previewTextureView layout changed");
+            updatePreviewVideoScaling();
+            updatePreviewOffView();
+          }
+        });
     return view;
   }
 
@@ -453,7 +469,7 @@ public class VideoCallFragment extends Fragment
     View view = getView();
     if (view != null) {
       // Code is more expressive with all flags present, even though some may be combined
-      //noinspection PointlessBitwiseExpression
+      // noinspection PointlessBitwiseExpression
       view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
     }
   }
@@ -633,7 +649,7 @@ public class VideoCallFragment extends Fragment
   @Override
   public void onCheckedChanged(CheckableImageButton button, boolean isChecked) {
     if (button == cameraOffButton) {
-      if (!isChecked && !VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+      if (!isChecked && !VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
         LogUtil.i("VideoCallFragment.onCheckedChanged", "show camera permission dialog");
         checkCameraPermission();
       } else {
@@ -654,23 +670,21 @@ public class VideoCallFragment extends Fragment
         "showPreview: %b, shouldShowRemote: %b",
         shouldShowPreview,
         shouldShowRemote);
-    this.shouldShowPreview = shouldShowPreview;
-    this.shouldShowRemote = shouldShowRemote;
-    this.isRemotelyHeld = isRemotelyHeld;
 
     videoCallScreenDelegate.getLocalVideoSurfaceTexture().attachToTextureView(previewTextureView);
     videoCallScreenDelegate.getRemoteVideoSurfaceTexture().attachToTextureView(remoteTextureView);
 
-    updateVideoOffViews();
-    updateRemoteVideoScaling();
+    this.isRemotelyHeld = isRemotelyHeld;
+    if (this.shouldShowRemote != shouldShowRemote) {
+      this.shouldShowRemote = shouldShowRemote;
+      updateRemoteOffView();
+    }
+    if (this.shouldShowPreview != shouldShowPreview) {
+      this.shouldShowPreview = shouldShowPreview;
+      updatePreviewOffView();
+    }
   }
 
-  /**
-   * This method scales the video feed inside the texture view, it doesn't change the texture view's
-   * size. In the old UI we would change the view size to match the aspect ratio of the video. In
-   * the new UI the view is always square (with the circular clip) so we have to do additional work
-   * to make sure the non-square video doesn't look squished.
-   */
   @Override
   public void onLocalVideoDimensionsChanged() {
     LogUtil.i("VideoCallFragment.onLocalVideoDimensionsChanged", null);
@@ -732,7 +746,6 @@ public class VideoCallFragment extends Fragment
     } else {
       exitFullscreenMode();
     }
-    updateVideoOffViews();
 
     OnHoldFragment onHoldFragment =
         ((OnHoldFragment)
@@ -853,6 +866,9 @@ public class VideoCallFragment extends Fragment
   }
 
   @Override
+  public void onAudioRouteSelectorDismiss() {}
+
+  @Override
   public void setPrimary(@NonNull PrimaryInfo primaryInfo) {
     LogUtil.i("VideoCallFragment.setPrimary", primaryInfo.toString());
     contactGridManager.setPrimary(primaryInfo);
@@ -1016,7 +1032,6 @@ public class VideoCallFragment extends Fragment
     params.addRule(RelativeLayout.ALIGN_PARENT_TOP);
     previewTextureView.setLayoutParams(params);
     previewTextureView.setOutlineProvider(null);
-    updatePreviewVideoScaling();
     updateOverlayBackground();
     contactGridManager.setIsMiddleRowVisible(true);
     updateMutePreviewOverlayVisibility();
@@ -1045,7 +1060,6 @@ public class VideoCallFragment extends Fragment
     params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
     previewTextureView.setLayoutParams(params);
     previewTextureView.setOutlineProvider(circleOutlineProvider);
-    updatePreviewVideoScaling();
     updateOverlayBackground();
     contactGridManager.setIsMiddleRowVisible(false);
     updateMutePreviewOverlayVisibility();
@@ -1055,7 +1069,9 @@ public class VideoCallFragment extends Fragment
     previewOffBlurredImageView.setClipToOutline(true);
   }
 
-  private void updateVideoOffViews() {
+  private void updatePreviewOffView() {
+    LogUtil.enterBlock("VideoCallFragment.updatePreviewOffView");
+
     // Always hide the preview off and remote off views in green screen mode.
     boolean previewEnabled = isInGreenScreenMode || shouldShowPreview;
     previewOffOverlay.setVisibility(previewEnabled ? View.GONE : View.VISIBLE);
@@ -1065,7 +1081,10 @@ public class VideoCallFragment extends Fragment
         shouldShowPreview,
         BLUR_PREVIEW_RADIUS,
         BLUR_PREVIEW_SCALE_FACTOR);
+  }
 
+  private void updateRemoteOffView() {
+    LogUtil.enterBlock("VideoCallFragment.updateRemoteOffView");
     boolean remoteEnabled = isInGreenScreenMode || shouldShowRemote;
     boolean isResumed = remoteEnabled && !isRemotelyHeld;
     if (isResumed) {
@@ -1092,7 +1111,6 @@ public class VideoCallFragment extends Fragment
           isRemotelyHeld ? R.string.videocall_remotely_held : R.string.videocall_remote_video_off);
       remoteVideoOff.setVisibility(View.VISIBLE);
     }
-    LogUtil.i("VideoCallFragment.updateVideoOffViews", "calling updateBlurredImageView");
     updateBlurredImageView(
         remoteTextureView,
         remoteOffBlurredImageView,
@@ -1101,52 +1119,60 @@ public class VideoCallFragment extends Fragment
         BLUR_REMOTE_SCALE_FACTOR);
   }
 
-  private void updateBlurredImageView(
+  @VisibleForTesting
+  void updateBlurredImageView(
       TextureView textureView,
       ImageView blurredImageView,
       boolean isVideoEnabled,
       float blurRadius,
       float scaleFactor) {
-    boolean didBlur = false;
-    long startTimeMillis = SystemClock.elapsedRealtime();
-    if (!isVideoEnabled) {
-      int width = Math.round(textureView.getWidth() * scaleFactor);
-      int height = Math.round(textureView.getHeight() * scaleFactor);
-      // This call takes less than 10 milliseconds.
-      Bitmap bitmap = textureView.getBitmap(width, height);
-      if (bitmap != null) {
-        // TODO: When the view is first displayed after a rotation the bitmap is empty
-        // and thus this blur has no effect.
-        // This call can take 100 milliseconds.
-        blur(getContext(), bitmap, blurRadius);
-
-        // TODO: Figure out why only have to apply the transform in landscape mode
-        if (width > height) {
-          bitmap =
-              Bitmap.createBitmap(
-                  bitmap,
-                  0,
-                  0,
-                  bitmap.getWidth(),
-                  bitmap.getHeight(),
-                  textureView.getTransform(null),
-                  true);
-        }
+    Context context = getContext();
 
-        blurredImageView.setImageBitmap(bitmap);
-        blurredImageView.setVisibility(View.VISIBLE);
-        didBlur = true;
-      }
+    if (isVideoEnabled || context == null) {
+      blurredImageView.setImageBitmap(null);
+      blurredImageView.setVisibility(View.GONE);
+      return;
     }
-    if (!didBlur) {
+
+    long startTimeMillis = SystemClock.elapsedRealtime();
+    int width = Math.round(textureView.getWidth() * scaleFactor);
+    int height = Math.round(textureView.getHeight() * scaleFactor);
+
+    LogUtil.i("VideoCallFragment.updateBlurredImageView", "width: %d, height: %d", width, height);
+
+    // This call takes less than 10 milliseconds.
+    Bitmap bitmap = textureView.getBitmap(width, height);
+
+    if (bitmap == null) {
       blurredImageView.setImageBitmap(null);
       blurredImageView.setVisibility(View.GONE);
+      return;
     }
 
+    // TODO(mdooley): When the view is first displayed after a rotation the bitmap is empty
+    // and thus this blur has no effect.
+    // This call can take 100 milliseconds.
+    blur(getContext(), bitmap, blurRadius);
+
+    // TODO(mdooley): Figure out why only have to apply the transform in landscape mode
+    if (width > height) {
+      bitmap =
+          Bitmap.createBitmap(
+              bitmap,
+              0,
+              0,
+              bitmap.getWidth(),
+              bitmap.getHeight(),
+              textureView.getTransform(null),
+              true);
+    }
+
+    blurredImageView.setImageBitmap(bitmap);
+    blurredImageView.setVisibility(View.VISIBLE);
+
     LogUtil.i(
         "VideoCallFragment.updateBlurredImageView",
-        "didBlur: %b, took %d millis",
-        didBlur,
+        "took %d millis",
         (SystemClock.elapsedRealtime() - startTimeMillis));
   }
 
@@ -1228,26 +1254,21 @@ public class VideoCallFragment extends Fragment
     videoCallScreenDelegate.onSystemUiVisibilityChange(navBarVisible);
   }
 
-  @Override
-  public void onCameraPermissionGranted() {
-    videoCallScreenDelegate.onCameraPermissionGranted();
-  }
-
   private void checkCameraPermission() {
     // Checks if user has consent of camera permission and the permission is granted.
     // If camera permission is revoked, shows system permission dialog.
     // If camera permission is granted but user doesn't have consent of camera permission
     // (which means it's first time making video call), shows custom dialog instead. This
     // will only be shown to user once.
-    if (!VideoUtils.hasCameraPermissionAndAllowedByUser(getContext())) {
+    if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(getContext())) {
       videoCallScreenDelegate.onCameraPermissionDialogShown();
       if (!VideoUtils.hasCameraPermission(getContext())) {
         requestPermissions(new String[] {permission.CAMERA}, CAMERA_PERMISSION_REQUEST_CODE);
       } else {
-        CameraPermissionDialogFragment.newInstance()
-            .show(getChildFragmentManager(), CAMERA_PERMISSION_DIALOG_FRAMENT_TAG);
+        PermissionsUtil.showCameraPermissionToast(getContext());
+        videoCallScreenDelegate.onCameraPermissionGranted();
       }
     }
   }
 }
-//LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java)
+// LINT.ThenChange(//depot/google3/third_party/java_src/android_app/dialer/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java)
diff --git a/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_checked_disabled.png b/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_checked_disabled.png
deleted file mode 100644
index 2deaadd76..000000000
--- a/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_checked_disabled.png
+++ /dev/null
diff --git a/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_disabled.png b/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_disabled.png
deleted file mode 100644
index 95d6824f5..000000000
--- a/java/com/android/incallui/video/impl/res/drawable-hdpi/video_button_bg_disabled.png
+++ /dev/null
diff --git a/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_checked_disabled.png b/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_checked_disabled.png
deleted file mode 100644
index c75281332..000000000
--- a/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_checked_disabled.png
+++ /dev/null
diff --git a/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_disabled.png b/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_disabled.png
deleted file mode 100644
index 1ff3e7c25..000000000
--- a/java/com/android/incallui/video/impl/res/drawable-mdpi/video_button_bg_disabled.png
+++ /dev/null
diff --git a/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_checked_disabled.png b/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_checked_disabled.png
deleted file mode 100644
index 4d5e03320..000000000
--- a/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_checked_disabled.png
+++ /dev/null
diff --git a/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_disabled.png b/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_disabled.png
deleted file mode 100644
index e5c3fc48d..000000000
--- a/java/com/android/incallui/video/impl/res/drawable-xhdpi/video_button_bg_disabled.png
+++ /dev/null
diff --git a/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_checked_disabled.png b/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_checked_disabled.png
deleted file mode 100644
index a0be8d17d..000000000
--- a/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_checked_disabled.png
+++ /dev/null
diff --git a/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_disabled.png b/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_disabled.png
deleted file mode 100644
index 996185890..000000000
--- a/java/com/android/incallui/video/impl/res/drawable-xxhdpi/video_button_bg_disabled.png
+++ /dev/null
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
index c67246675..1a2bc2429 100644
--- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
+++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -32,7 +32,7 @@
     android:id="@+id/videocall_remote_video_off"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
+    android:layout_centerInParent="true"
     android:accessibilityTraversalBefore="@+id/videocall_speaker_button"
     android:drawablePadding="8dp"
     android:drawableTop="@drawable/quantum_ic_videocam_off_white_36"
@@ -71,20 +71,23 @@
       android:visibility="gone"
       android:importantForAccessibility="no"
       tools:visibility="visible"/>
-
-    <ImageView
-      android:id="@+id/videocall_video_preview_mute_overlay"
-      android:layout_width="32dp"
-      android:layout_height="32dp"
-      android:layout_gravity="center"
-      android:background="@drawable/videocall_background_circle_white"
-      android:contentDescription="@string/incall_content_description_muted"
-      android:scaleType="center"
-      android:src="@drawable/quantum_ic_mic_off_black_24"
-      android:visibility="gone"
-      tools:visibility="visible"/>
   </FrameLayout>
 
+  <ImageView
+    android:id="@+id/videocall_video_preview_mute_overlay"
+    android:layout_width="32dp"
+    android:layout_height="32dp"
+    android:layout_alignBottom="@id/videocall_preview_root"
+    android:layout_alignEnd="@id/videocall_preview_root"
+    android:layout_marginBottom="-8dp"
+    android:layout_marginEnd="-8dp"
+    android:background="@drawable/videocall_background_circle_white"
+    android:contentDescription="@string/incall_content_description_muted"
+    android:scaleType="center"
+    android:src="@drawable/quantum_ic_mic_off_black_24"
+    android:visibility="gone"
+    tools:visibility="visible"/>
+
   <View
     android:id="@+id/videocall_green_screen_background"
     android:layout_width="match_parent"
@@ -102,4 +105,4 @@
     android:layout_height="wrap_content"
     android:layout_gravity="top"/>
 
-</FrameLayout>
+</RelativeLayout>
diff --git a/java/com/android/incallui/video/impl/res/values-af/strings.xml b/java/com/android/incallui/video/impl/res/values-af/strings.xml
index 91e650a61..92a48dad1 100644
--- a/java/com/android/incallui/video/impl/res/values-af/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-af/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Hulle video is af"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Hulle video is aan"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Oproep gehou"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Oproep is hervat"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Laat video toe?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Die Foon-program wil jou kamera vir video-oproepe gebruik."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Laat toe"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Weier"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-am/strings.xml b/java/com/android/incallui/video/impl/res/values-am/strings.xml
index 307cae49f..e8d660288 100644
--- a/java/com/android/incallui/video/impl/res/values-am/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-am/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ቪዲዮዋቸው ጠፍቷል"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"የእነሱ ቪዲዮ በርቷል"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ጥሪ በይቆይ ላይ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ጥሪ ከቆመበት ቀጥሏል"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ቪድዮ ይፈቀድ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"የስልክ መተግበሪያው ለቪድዮ ጥሪዎች ካሜራዎን መጠቀም ይፈልጋል።"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ፍቀድ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ከልክል"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ar/strings.xml b/java/com/android/incallui/video/impl/res/values-ar/strings.xml
index 8b5893e63..571ed994e 100644
--- a/java/com/android/incallui/video/impl/res/values-ar/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ar/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"الفيديو الخاص بهم قيد إيقاف التشغيل"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"الفيديو قيد التشغيل"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"المكالمة معلقة"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"تم استئناف المكالمة"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"السماح بالفيديو؟"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"يريد تطبيق الهاتف استخدام الكاميرا لإجراء مكالمات الفيديو."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"سماح"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"رفض"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-az/strings.xml b/java/com/android/incallui/video/impl/res/values-az/strings.xml
index 5fca42d35..f47ff9fcb 100644
--- a/java/com/android/incallui/video/impl/res/values-az/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-az/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoları deaktivdir"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Bu video aktivdir"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Zəng gözləmədədir"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Zəng davam edir"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Videoya icazə verilsin?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon tətbiqi video zənglər üçün kameranızı istifadə etmək istəyir."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"İcazə verin"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Rədd edin"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
index 5381ecc68..aa0635dd0 100644
--- a/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video je isključen"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kamera ove osobe je uključena"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv je na čekanju"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Želite da dozvolite video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija Telefon želi da koristi vašu kameru za video pozive."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Dozvoli"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odbij"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-be/strings.xml b/java/com/android/incallui/video/impl/res/values-be/strings.xml
index 4af9ce713..b80483550 100644
--- a/java/com/android/incallui/video/impl/res/values-be/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-be/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Відэа гэтага чалавека адключана"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Відэа гэтага чалавека ўключана"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Выклік на ўтрыманні"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Выклік адноўлены"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Дазволіць відэа?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Праграма Тэлефон хоча карыстацца вашай камерай для відэавыклікаў."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Дазволіць"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Адмовіць"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bg/strings.xml b/java/com/android/incallui/video/impl/res/values-bg/strings.xml
index 6ae1b532f..1459f9550 100644
--- a/java/com/android/incallui/video/impl/res/values-bg/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bg/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видеото отсреща е изкл."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Видеото на другия участник е включено"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Задържано обаждане"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Възобновено обажд."</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Да се разреши ли видео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Приложението Телефон иска да използва камерата ви за видеообаждания."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Разрешаване"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Отказване"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bn/strings.xml b/java/com/android/incallui/video/impl/res/values-bn/strings.xml
index 511989ca2..0c3c6453d 100644
--- a/java/com/android/incallui/video/impl/res/values-bn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bn/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"তাদের ভিডিও বন্ধ রয়েছে"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"তাদের ভিডিও চালু রয়েছে"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"কলটি হোল্ডে রয়েছে"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"কল পুনরায় শুরু করা হয়েছে"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ভিডিওর মঞ্জুরি দেবেন?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ফোন অ্যাপটি ভিডিও কলগুলির জন্য আপনার ক্যামেরা ব্যবহার করতে চায়৷"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"অনুমতি দিন"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"আস্বীকার করুন"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bs/strings.xml b/java/com/android/incallui/video/impl/res/values-bs/strings.xml
index b27137f3f..47d1d0263 100644
--- a/java/com/android/incallui/video/impl/res/values-bs/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bs/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Kamera je isključena"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kamera je uključena"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv na čekanju"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Dozvoliti pristup kameri?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija za telefon želi koristiti kameru za videopozive?"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Dozvoli"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odbij"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ca/strings.xml b/java/com/android/incallui/video/impl/res/values-ca/strings.xml
index 9db64e008..9745bcb15 100644
--- a/java/com/android/incallui/video/impl/res/values-ca/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ca/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Tenen vídeo desactivat"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Té el vídeo activat"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Trucada en espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Trucada represa"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Vols permetre el vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"L\'aplicació Telèfon vol fer servir la càmera per a les videotrucades."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permet"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Denega"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-cs/strings.xml b/java/com/android/incallui/video/impl/res/values-cs/strings.xml
index 07b5e01b7..d8258e54e 100644
--- a/java/com/android/incallui/video/impl/res/values-cs/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-cs/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video tohoto uživatele je vypnuto"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video tohoto uživatele je zapnuto"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Podržený hovor"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hovor byl obnoven"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Povolit video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikace Telefon chcete při videohovorech používat vaši kameru."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Povolit"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Zakázat"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-da/strings.xml b/java/com/android/incallui/video/impl/res/values-da/strings.xml
index 35a7f1636..a52a2bca7 100644
--- a/java/com/android/incallui/video/impl/res/values-da/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-da/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vedkommendes video er slået fra"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Vedkommendes video er slået til"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Parkeret opkald"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Opkaldet er genoptaget"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Vil du tillade videoen?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Appen Fotos vil gerne bruge dit kamera til videoopkald."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Tillad"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Afvis"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-de/strings.xml b/java/com/android/incallui/video/impl/res/values-de/strings.xml
index e6ae11e9c..fcc8fb9df 100644
--- a/java/com/android/incallui/video/impl/res/values-de/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-de/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video deaktiviert"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video ist aktiviert"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Anruf wird gehalten."</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Anruf fortgesetzt"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Video zulassen?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Die App \"Telefon\" möchte die Kamera für Videoanrufe verwenden."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Zulassen"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Ablehnen"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-el/strings.xml b/java/com/android/incallui/video/impl/res/values-el/strings.xml
index 354648175..eb4c67168 100644
--- a/java/com/android/incallui/video/impl/res/values-el/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-el/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Το βίντεό τους απεν."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Το βίντεό τους είναι ενεργοποιημένο"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Κλήση σε αναμονή"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Συνέχιση κλήσης"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Να επιτραπεί η χρήση βίντεο;"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Η εφαρμογή Τηλέφωνο θέλει να χρησιμοποιήσει την κάμερά σας για βιντεοκλήσεις."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Να επιτραπεί"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Να μην επιτραπεί"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
index 9fee9f815..167760057 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Allow video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"The Phone app wants to use your camera for video calls."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Allow"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Deny"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
index 9fee9f815..167760057 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Allow video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"The Phone app wants to use your camera for video calls."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Allow"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Deny"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
index 9fee9f815..167760057 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Allow video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"The Phone app wants to use your camera for video calls."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Allow"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Deny"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
index 7175c5085..46765ac70 100644
--- a/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video desactivado"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"El video está activado."</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Llamada en espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Llamada reanudada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"¿Deseas habilitar el video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"La app de teléfono quiere usar la cámara para las videollamadas."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Denegar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-es/strings.xml b/java/com/android/incallui/video/impl/res/values-es/strings.xml
index c28ecf556..035bc3cff 100644
--- a/java/com/android/incallui/video/impl/res/values-es/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-es/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desactivado"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Su vídeo está activado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Llamada en espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Llamada reanudada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"¿Quieres permitir el vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"La aplicación Teléfono quiere usar la cámara para realizar videollamadas."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Denegar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-et/strings.xml b/java/com/android/incallui/video/impl/res/values-et/strings.xml
index db5e9f154..d685d0bae 100644
--- a/java/com/android/incallui/video/impl/res/values-et/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-et/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Nende video on välj."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Nende video on eetris"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Kõne on ootel"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Kõne jätkub"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Kas lubada video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Rakendus Telefon soovib videokõnede jaoks teie kaamerat kasutada."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Luba"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Keela"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-eu/strings.xml b/java/com/android/incallui/video/impl/res/values-eu/strings.xml
index 21f36b100..daa30e08a 100644
--- a/java/com/android/incallui/video/impl/res/values-eu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-eu/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Bideoa desaktibatuta"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Aktibatuta du bideoa"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Zain dago deia"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Deiari berrekin zaio"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Kamera atzitzeko baimena eman?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Bideo-deiak egiteko, kamera atzitzeko baimena behar du Telefonoa aplikazioak."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Baimendu"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Ukatu"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fa/strings.xml b/java/com/android/incallui/video/impl/res/values-fa/strings.xml
index eb264b0c1..4c4c186b8 100644
--- a/java/com/android/incallui/video/impl/res/values-fa/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fa/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ویدیوی طرف مقابل غیرفعال است"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ویدیوی طرف مقابل فعال است"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"تماس درحال انتظار"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"تماس ازسرگرفته‌شده"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ویدیو مجاز است؟"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"برنامه تلفن می‌خواهد برای تماس‌های ویدیویی از دوربینتان استفاده کند."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"مجاز است"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"رد کردن"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fi/strings.xml b/java/com/android/incallui/video/impl/res/values-fi/strings.xml
index ff1427f55..eae4b436a 100644
--- a/java/com/android/incallui/video/impl/res/values-fi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fi/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Ei videota"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Hänen videonsa on päällä"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Puhelu pidossa"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Puhelua jatkettiin"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Sallitaanko video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Puhelin-sovellus haluaa käyttää kameraa videopuheluiden soittamista varten."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Salli"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Estä"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
index 548af9fb8..e59d14bd8 100644
--- a/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vidéo désactivée"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Sa vidéo est activée"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Appel en attente"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Appel repris"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Autoriser la vidéo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"L\'application Téléphone veut utiliser votre caméra pour les appels vidéo."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Autoriser"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Refuser"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fr/strings.xml b/java/com/android/incallui/video/impl/res/values-fr/strings.xml
index f49b86fcd..5ef45439a 100644
--- a/java/com/android/incallui/video/impl/res/values-fr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fr/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vidéo désactivée"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Leur vidéo est lancée"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Appel en attente"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Reprise de l\'appel"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Autoriser la vidéo ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"L\'application Téléphone requiert l\'utilisation de la caméra de votre appareil pour les appels vidéo."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Autoriser"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Refuser"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-gl/strings.xml b/java/com/android/incallui/video/impl/res/values-gl/strings.xml
index 61a91e900..263ee3be5 100644
--- a/java/com/android/incallui/video/impl/res/values-gl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-gl/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desactivado"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"O seu vídeo está activado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada en espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Retomouse a chamada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Queres permitir o vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"A aplicación Teléfono quere utilizar a túa cámara para as videochamadas."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Denegar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-gu/strings.xml b/java/com/android/incallui/video/impl/res/values-gu/strings.xml
index 68ad3886c..8164e6e7f 100644
--- a/java/com/android/incallui/video/impl/res/values-gu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-gu/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"તેમનો વિડિઓ બંધ છે"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"તેમની વિડિઓ ચાલુ છે"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"કૉલ હોલ્ડ પર છે"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"કૉલ ફરી શરૂ કર્યો"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"વિડિઓની મંજૂરી આપીએ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ફોન ઍપ્લિકેશન વિડિઓ કૉલ્સ માટે તમારા કૅમેરાનો ઉપયોગ કરવા માંગે છે."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"મંજૂરી આપો"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"નકારો"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
index a53fb6404..e9e7f9e8b 100644
--- a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
@@ -19,5 +19,5 @@
   <dimen name="videocall_button_size">72dp</dimen>
   <dimen name="videocall_preview_width">88dp</dimen>
   <dimen name="videocall_preview_height">88dp</dimen>
-  <dimen name="videocall_preview_long">104dp</dimen>
+  <dimen name="videocall_preview_long">116dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hi/strings.xml b/java/com/android/incallui/video/impl/res/values-hi/strings.xml
index e3ff5d8b9..bce1eb605 100644
--- a/java/com/android/incallui/video/impl/res/values-hi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hi/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"उनका वीडियो बंद है"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"उनका वीडियो चालू है"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"कॉल होल्ड पर है"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कॉल फिर से शुरू किया गया"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"क्या वीडियो की अनुमति देना चाहते हैं?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"फ़ोन ऐप्लिकेशन, वीडियो कॉल के लिए आपके कैमरे का उपयोग करना चाहता है."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"अनुमति दें"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"अस्वीकार करें"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hr/strings.xml b/java/com/android/incallui/video/impl/res/values-hr/strings.xml
index 9acb9e357..9acadbba0 100644
--- a/java/com/android/incallui/video/impl/res/values-hr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hr/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videokamera je isk."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Videopoziv je uključen"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv na čekanju"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Dopustiti pristup kameri?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija Telefon želi koristiti vašu kameru za videopozive."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Omogući"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odbij"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hu/strings.xml b/java/com/android/incallui/video/impl/res/values-hu/strings.xml
index 9b34cadea..0042d830f 100644
--- a/java/com/android/incallui/video/impl/res/values-hu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hu/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"A videokép leállt"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"A videokép be van kapcsolva"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Várakoztatás"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hívás folytatva"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Engedélyezi a videoképet?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"A Telefon alkalmazás videohíváshoz szeretné használni a kamerát."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Engedélyezés"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Elutasítás"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hy/strings.xml b/java/com/android/incallui/video/impl/res/values-hy/strings.xml
index ee94cd52d..fb06169e0 100644
--- a/java/com/android/incallui/video/impl/res/values-hy/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hy/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Իր խցիկն անջատած է"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Զրուցակցի խցիկը միացած է"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Զանգը սպասման մեջ է"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Զանգը վերսկսվեց"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Թույլատրե՞լ տեսագրում:"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Տեսազանգերի համար «Հեռախոս» հավելվածը պետք է օգտագործի ձեր տեսախցիկը:"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Թույլ տալ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Մերժել"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-in/strings.xml b/java/com/android/incallui/video/impl/res/values-in/strings.xml
index 025ba8822..6abb2a758 100644
--- a/java/com/android/incallui/video/impl/res/values-in/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-in/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video mereka nonaktif"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video mereka aktif"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Panggilan ditahan"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Panggilan dilanjutkan"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Izinkan video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikasi Telepon ingin menggunakan kamera untuk video call."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Izinkan"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Tolak"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-is/strings.xml b/java/com/android/incallui/video/impl/res/values-is/strings.xml
index fce879b76..e1834ddbe 100644
--- a/java/com/android/incallui/video/impl/res/values-is/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-is/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Slökkt er á mynd"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kveikt er á myndskeiði viðkomandi"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Símtal í bið"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Símtal heldur áfram"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Viltu leyfa myndupptöku?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Símaforritið vill nota myndavélina í myndsímtöl."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Leyfa"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Hafna"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-it/strings.xml b/java/com/android/incallui/video/impl/res/values-it/strings.xml
index ea9746c2a..fd7549d0f 100644
--- a/java/com/android/incallui/video/impl/res/values-it/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-it/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Il suo video non è attivo"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Il loro video è attivo"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chiamata in attesa"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chiamata ripristinata"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Consentire l\'uso del video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"L\'app Telefono desidera utilizzare la fotocamera per le videochiamate."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Consenti"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Rifiuta"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-iw/strings.xml b/java/com/android/incallui/video/impl/res/values-iw/strings.xml
index 4f38da372..c93dbb831 100644
--- a/java/com/android/incallui/video/impl/res/values-iw/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-iw/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"הווידאו של הצד השני מושבת"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"הווידאו של הצד השני מופעל"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"השיחה הועברה להמתנה"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"השיחה חודשה"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"האם לאפשר גישה לווידאו?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"אפליקציית הטלפון רוצה להשתמש במצלמה שלך לשיחות וידאו."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"אפשר"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"דחה"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ja/strings.xml b/java/com/android/incallui/video/impl/res/values-ja/strings.xml
index 1c916ef52..8a5d99ab0 100644
--- a/java/com/android/incallui/video/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ja/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"相手のビデオ: OFF"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"相手のビデオ: ON"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"通話保留中"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通話が再開されました"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ビデオを許可しますか？"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ビデオハングアウトを利用するには、電話アプリにカメラへのアクセスを許可する必要があります。"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"許可"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"拒否"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ka/strings.xml b/java/com/android/incallui/video/impl/res/values-ka/strings.xml
index 7533b7235..6340c5f63 100644
--- a/java/com/android/incallui/video/impl/res/values-ka/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ka/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"მათი ვიდ. გამორთულია"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"მისი ვიდეო ჩართულია"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ზარი მოცდის რეჟიმშია"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ზარი განახლდა"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"გსურთ ვიდეოს დაშვება?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ტელეფონის აპს სურს თქვენი კამერის გამოყენება ვიდეოზარებისთვის."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"დაშვება"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"უარყოფა"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-kk/strings.xml b/java/com/android/incallui/video/impl/res/values-kk/strings.xml
index 56077d808..9f7626bf8 100644
--- a/java/com/android/incallui/video/impl/res/values-kk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-kk/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Олардың бейнесі өшірулі"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Олардың бейне құралы қосулы"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Қоңырау күту күйінде"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Қоңырауды жалғастырды"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Бейнеге рұқсат беру қажет пе?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Телефон қолданбасы камераңызды бейне қоңыраулар үшін пайдаланғысы келеді."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Рұқсат беру"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Рұқсат бермеу"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-km/strings.xml b/java/com/android/incallui/video/impl/res/values-km/strings.xml
index cd4d55a11..8d5cac488 100644
--- a/java/com/android/incallui/video/impl/res/values-km/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-km/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"វីដេអូ​របស់​ពួកគេ​ត្រូវ​បាន​បិទ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"វីដេអូ​របស់​ពួកគេ​ត្រូវ​បាន​បើក"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ការ​ហៅ​កំពុង​រង់ចាំ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"បាន​បន្ត​ការ​ហៅ​ទូរសព្ទ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"អនុញ្ញាត​វីដេអូ​ដែរ​ឬ​ទេ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"កម្មវិធី​ទូរសព្ទ​ចង់​ប្រើប្រាស់​កាមេរ៉ា​របស់​អ្នក​ដើម្បី​ហៅ​ជា​វីដេអូ។"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"អនុញ្ញាត"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"បដិសេធ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-kn/strings.xml b/java/com/android/incallui/video/impl/res/values-kn/strings.xml
index 0f84a0b94..09ff808af 100644
--- a/java/com/android/incallui/video/impl/res/values-kn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-kn/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ಅವರ ವೀಡಿಯೊ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ಅವರ ವಿಡಿಯೋ ಆನ್ ಆಗಿದೆ"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ಕರೆ ಹೋಲ್ಡ್‌ ಮಾಡಿದೆ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ಕರೆಯನ್ನು ಪುನರಾರಂಭಿಸಲಾಗಿದೆ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ವೀಡಿಯೊವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ವೀಡಿಯೊ ಕರೆಗಳಿಗೆ ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಕ್ಯಾಮರಾವನ್ನು ಬಳಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ಅನುಮತಿಸಿ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ನಿರಾಕರಿಸಿ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ko/strings.xml b/java/com/android/incallui/video/impl/res/values-ko/strings.xml
index ed258587f..6feb99185 100644
--- a/java/com/android/incallui/video/impl/res/values-ko/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ko/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"상대방 동영상 꺼짐"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"동영상이 켜져 있음"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"통화 대기 중"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"통화 재개됨"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"동영상을 허용하시겠습니까?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"전화 앱에서 화상 통화를 위해 카메라를 사용하고자 합니다."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"허용"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"거부"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ky/strings.xml b/java/com/android/incallui/video/impl/res/values-ky/strings.xml
index ac002dde7..c61db4a27 100644
--- a/java/com/android/incallui/video/impl/res/values-ky/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ky/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Камерасы өчүк"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Алардын видеосу күйгүзүлгөн"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Чалуу күтүүгө коюлду."</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Чалуу улантылды"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Видеого уруксат берилсинби?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Телефон колдонмосуна видео режиминде чалуу үчүн камераңыз керек."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Уруксат берүү"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Жок"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-land/dimens.xml b/java/com/android/incallui/video/impl/res/values-land/dimens.xml
index 6485735e2..d0a5e409a 100644
--- a/java/com/android/incallui/video/impl/res/values-land/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values-land/dimens.xml
@@ -15,5 +15,5 @@
   ~ limitations under the License
   -->
 <resources>
-  <dimen name="videocall_preview_long">92dp</dimen>
+  <dimen name="videocall_preview_long">96dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-land/styles.xml b/java/com/android/incallui/video/impl/res/values-land/styles.xml
index a809708df..f60dbd1d6 100644
--- a/java/com/android/incallui/video/impl/res/values-land/styles.xml
+++ b/java/com/android/incallui/video/impl/res/values-land/styles.xml
@@ -16,7 +16,8 @@
   -->
 <resources>
   <style name="VideoPreviewHolder">
-    <item name="android:layout_gravity">bottom|end</item>
+    <item name="android:layout_alignParentBottom">true</item>
+    <item name="android:layout_alignParentEnd">true</item>
     <item name="android:layout_width">@dimen/videocall_preview_long</item>
     <item name="android:layout_height">@dimen/videocall_preview_height</item>
     <item name="android:layout_marginBottom">@dimen/videocall_preview_margin_bottom</item>
diff --git a/java/com/android/incallui/video/impl/res/values-lo/strings.xml b/java/com/android/incallui/video/impl/res/values-lo/strings.xml
index f8481ebfa..11505dd99 100644
--- a/java/com/android/incallui/video/impl/res/values-lo/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lo/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ວິດີໂອຂອງເຂົາເຈົ້າປິດຢູ່"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ເຂົາເຈົ້າເປີດວິດີໂອຢູ່"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ພັກສາຍຢູ່"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ສືບຕໍ່ສາຍແລ້ວ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ອະນຸຍາດວິດີໂອບໍ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ແອັບໂທລະສັບຢາກໃຊ້ກ້ອງຂອງທ່ານເພື່ອໂທແບບວິດີໂອ."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ອະນຸຍາດ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ປະຕິເສດ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-lt/strings.xml b/java/com/android/incallui/video/impl/res/values-lt/strings.xml
index 2890ad3a2..4ef10a4ee 100644
--- a/java/com/android/incallui/video/impl/res/values-lt/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lt/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vaizdo kamera išjungta"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Jų vaizdo įrašas rodomas"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Skambutis sulaikytas"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Skambutis tęsiamas"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Leisti vaizdą?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefono programa nori naudoti kamerą, kad būtų galima atlikti vaizdo skambučius."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Leisti"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Atmesti"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-lv/strings.xml b/java/com/android/incallui/video/impl/res/values-lv/strings.xml
index 75e81f16e..220a30c2b 100644
--- a/java/com/android/incallui/video/impl/res/values-lv/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lv/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video ir izslēgts"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Dalībnieku video ir ieslēgts"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Zvans aizturēts"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Zvans ir atsākts"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Vai atļaut video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Lietotnē Tālrunis tiek mēģināts izmantot jūsu kameru videozvaniem."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Atļaut"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Aizliegt"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mk/strings.xml b/java/com/android/incallui/video/impl/res/values-mk/strings.xml
index 90528bcd7..8a764a2ab 100644
--- a/java/com/android/incallui/video/impl/res/values-mk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mk/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видеото е исклучено"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Нивното видео е вклучено"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Повик на чекање"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Повикот продолжи"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Да се дозволи видео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Апликацијата Телефон сака да ја користи вашата камера за видеоповици."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Овозможи"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Одбиј"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ml/strings.xml b/java/com/android/incallui/video/impl/res/values-ml/strings.xml
index 1958fa49e..a20a4caa9 100644
--- a/java/com/android/incallui/video/impl/res/values-ml/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ml/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"അവരുടെ വീഡിയോ ഓഫാണ്"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"അവരുടെ വീഡിയോ ഓണാണ്"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"കോൾ ഹോൾഡിലാണ്"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"കോൾ വീണ്ടും ആരംഭിച്ചു"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"വീഡിയോ അനുവദിക്കണോ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"വീഡിയോ കോളുകൾക്ക് നിങ്ങളുടെ ക്യാമറ ഉപയോഗിക്കാൻ ഫോൺ ആപ്പ് താൽപ്പര്യപ്പെടുന്നു."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"അനുവദിക്കുക"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"നിരസിക്കുക"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mn/strings.xml b/java/com/android/incallui/video/impl/res/values-mn/strings.xml
index 8e2186ac9..5e2c354bb 100644
--- a/java/com/android/incallui/video/impl/res/values-mn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mn/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Тэдний видео идэвхгүй байна"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Тэдний видео идэвхтэй байна"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Дуудлага хүлээлгэсэн"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Дуудлагыг үргэлжлүүлсэн"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Видеог зөвшөөрөх үү?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Утас апп видео дуудлага хийхэд таны камерыг ашиглахыг хүсэж байна."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Зөвшөөрөх"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Татгалзах"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mr/strings.xml b/java/com/android/incallui/video/impl/res/values-mr/strings.xml
index 2119cdc94..c8ea9bc50 100644
--- a/java/com/android/incallui/video/impl/res/values-mr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mr/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"त्यांचा व्हिडिओ बंद केला आहे"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"त्यांचा व्हिडिओ चालू आहे"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"कॉल होल्डवर आहे"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कॉल पुनः सुरु झाला"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"व्हिडिओला अनुमती द्यायची?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"व्हिडिओ कॉलसाठी फोन अॅप आपला कॅमेरा वापरू इच्छितो."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"अनुमती द्या"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"नकार द्या"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ms/strings.xml b/java/com/android/incallui/video/impl/res/values-ms/strings.xml
index fe2e563b3..f8866259f 100644
--- a/java/com/android/incallui/video/impl/res/values-ms/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ms/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video mrk dimatikan"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video mereka dihidupkan"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Panggilan ditunda"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Pgln disambung smla"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Benarkan video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Apl Telefon mahu menggunakan kamera anda untuk panggilan video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Benarkan"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Tolak"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-my/strings.xml b/java/com/android/incallui/video/impl/res/values-my/strings.xml
index 10788dfa8..93749a33a 100644
--- a/java/com/android/incallui/video/impl/res/values-my/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-my/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"သူတို့ဗီဒီယို ပိတ်ထားသည်"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"၎င်းတို့၏ဗီဒီယိုကို ဖွင့်ထားပါသည်"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ခေါ်ဆိုမှု ခဏရပ်ထားသည်"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ခေါ်ဆိုမှုပြန်စသည်"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ဗီဒီယို ခွင့်ပြုမလား။"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ဗီဒီယိုခေါ်ဆိုမှုများအတွက် သင့်ကင်မရာကို Phone အက်ပ်က အသုံးပြုလိုပါသည်။"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ခွင့်ပြုရန်"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ငြင်းပယ်ရန်"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-nb/strings.xml b/java/com/android/incallui/video/impl/res/values-nb/strings.xml
index 249065bb2..8b44300c6 100644
--- a/java/com/android/incallui/video/impl/res/values-nb/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-nb/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoen deres er slått av"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Den andre partens video er på"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Samtalen er på vent"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtale gjenopptatt"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Tillat video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon-appen ønsker å bruke kameraet ditt til videosamtaler."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Tillat"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Ikke tillat"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ne/strings.xml b/java/com/android/incallui/video/impl/res/values-ne/strings.xml
index e2850aee9..66d236dd8 100644
--- a/java/com/android/incallui/video/impl/res/values-ne/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ne/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"उनीहरूको भिडियो बन्द छ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"उनीहरूको भिडियो सक्रिय छ"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"कल होल्डमा छ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कल पुन: सुचारु गरियो"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"भिडियो खिच्ने अनुमति दिने हो?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"फोन अनुप्रयोगले भिडियो कलका लागि तपाईंको क्यामेरा प्रयोग गर्न चाहन्छ।"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"अनुमति दिनुहोस्"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"अस्वीकार गर्नुहोस्"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-nl/strings.xml b/java/com/android/incallui/video/impl/res/values-nl/strings.xml
index b797b13c6..b83a72b4d 100644
--- a/java/com/android/incallui/video/impl/res/values-nl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-nl/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video staat uit"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Zijn video is aan"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Gesprek in de wacht"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Gesprek hervat"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Video toestaan?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"De app Telefoon wil je camera gebruiken voor videogesprekken."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Toestaan"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Weigeren"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-no/strings.xml b/java/com/android/incallui/video/impl/res/values-no/strings.xml
index 249065bb2..8b44300c6 100644
--- a/java/com/android/incallui/video/impl/res/values-no/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-no/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoen deres er slått av"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Den andre partens video er på"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Samtalen er på vent"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtale gjenopptatt"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Tillat video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon-appen ønsker å bruke kameraet ditt til videosamtaler."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Tillat"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Ikke tillat"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pa/strings.xml b/java/com/android/incallui/video/impl/res/values-pa/strings.xml
index 6bded1de3..e23efe1a2 100644
--- a/java/com/android/incallui/video/impl/res/values-pa/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pa/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ਉਹਨਾਂ ਦਾ ਵੀਡੀਓ ਬੰਦ ਹੈ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ਉਹਨਾਂ ਦਾ ਵੀਡੀਓ ਚਾਲੂ ਹੈ"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ਕਾਲ ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ਕਾਲ ਮੁੜ-ਸ਼ੁਰੂ ਕੀਤੀ ਗਈ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ਕੀ ਵੀਡੀਓ ਦੀ ਇਜਾਜ਼ਤ ਦੇਣੀ ਹੈ?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ਫ਼ੋਨ ਐਪ ਵੀਡੀਓ ਕਾਲਾਂ ਲਈ ਤੁਹਾਡੇ ਕੈਮਰੇ ਦੀ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pl/strings.xml b/java/com/android/incallui/video/impl/res/values-pl/strings.xml
index 355ad6f47..c84ea6929 100644
--- a/java/com/android/incallui/video/impl/res/values-pl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pl/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Wideo tej osoby wył."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Obraz wideo tej osoby jest włączony"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Rozmowa wstrzymana"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Połączenie wznowione"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Pozwolić na tryb wideo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacja Telefon chce używać kamery do rozmów wideo."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Zezwól"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odmów"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
index 1171ac01d..f5c8ceaae 100644
--- a/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo remoto desativ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo deste contato está ativado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Permitir vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Permitir que o app Telefone use sua câmera para fazer videochamadas?"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Negar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
index 8480031bb..1c5fc57dc 100644
--- a/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desativado"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo está ligado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Permitir vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"A aplicação Telefone pretende utilizar a sua câmara para videochamadas."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Recusar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt/strings.xml b/java/com/android/incallui/video/impl/res/values-pt/strings.xml
index 1171ac01d..f5c8ceaae 100644
--- a/java/com/android/incallui/video/impl/res/values-pt/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo remoto desativ"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo deste contato está ativado"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Permitir vídeo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Permitir que o app Telefone use sua câmera para fazer videochamadas?"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permitir"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Negar"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ro/strings.xml b/java/com/android/incallui/video/impl/res/values-ro/strings.xml
index eaae4752c..6cd5193bd 100644
--- a/java/com/android/incallui/video/impl/res/values-ro/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ro/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Imagine dezactivată"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Imaginea sa video este activată."</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Apel în așteptare"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"S-a reluat apelul."</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Permiteți transmisia video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplicația Telefon vrea să utilizeze camera foto pentru apeluri video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Permiteți"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Refuzați"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ru/strings.xml b/java/com/android/incallui/video/impl/res/values-ru/strings.xml
index 8b29882aa..3e62d0e5b 100644
--- a/java/com/android/incallui/video/impl/res/values-ru/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ru/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Камера собеседника выключена"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Видео собеседника включено"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Вызов на удержании"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Вызов возобновлен"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Включить видео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Для видеовстреч приложению \"Телефон\" необходим доступ к камере."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Разрешить"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Запретить"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-si/strings.xml b/java/com/android/incallui/video/impl/res/values-si/strings.xml
index e9869fe1c..52e55737a 100644
--- a/java/com/android/incallui/video/impl/res/values-si/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-si/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"වීඩියෝ අක්‍රිය කර ඇ."</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ඔවුන්ගේ වීඩියෝව ක්‍රියාත්මකයි"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"ඇමතුම රඳවාගෙන ඇත"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ඇමතුම නැවත ආරම්භ විය"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"වීඩියෝවට ඉඩ දෙන්නද?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"දුරකථන යෙදුමට වීඩියෝ ඇමතුම් සඳහා ඔබේ කැමරාව භාවිත කිරීමට අවශ්‍යයි."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"ඉඩ දෙන්න"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ප්‍රතික්ෂේප කරන්න"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sk/strings.xml b/java/com/android/incallui/video/impl/res/values-sk/strings.xml
index a2438ac3b..c9920b388 100644
--- a/java/com/android/incallui/video/impl/res/values-sk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sk/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Má vypnuté video"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video tohto používateľa je zapnuté"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Hovor je podržaný"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hovor bol obnovený"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Povoliť video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikácia Telefón chce pri videohovoroch používať vašu kameru."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Povoliť"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Odmietnuť"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sl/strings.xml b/java/com/android/incallui/video/impl/res/values-sl/strings.xml
index 42d4b0c0e..8c6baed80 100644
--- a/java/com/android/incallui/video/impl/res/values-sl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sl/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video je izklopljen"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video te osebe je vklopljen"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Klic je zadržan"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Klic se nadaljuje"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Želite omogočiti video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacija Telefon želi za videoklice uporabiti vaš fotoaparat."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Dovoli"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Zavrni"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sq/strings.xml b/java/com/android/incallui/video/impl/res/values-sq/strings.xml
index 595633314..77a764849 100644
--- a/java/com/android/incallui/video/impl/res/values-sq/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sq/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video e tyre joaktive"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Videoja e tyre është aktive"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Telefonatë në pritje"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Telefonata vazhdoi"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Të lejohet video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Aplikacioni \"Telefoni\" dëshiron të përdorë aparatin tënd për telefonata me video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Lejo"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Refuzo"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sr/strings.xml b/java/com/android/incallui/video/impl/res/values-sr/strings.xml
index 8a2ef6aee..ce7070d17 100644
--- a/java/com/android/incallui/video/impl/res/values-sr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sr/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видео је искључен"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Камера ове особе је укључена"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Позив је на чекању"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Позив је настављен"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Желите да дозволите видео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Апликација Телефон жели да користи вашу камеру за видео позиве."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Дозволи"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Одбиј"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sv/strings.xml b/java/com/android/incallui/video/impl/res/values-sv/strings.xml
index cbedf9b67..29221de61 100644
--- a/java/com/android/incallui/video/impl/res/values-sv/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sv/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Deras video avstängd"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Andra partens video är på"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Parkerat samtal"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtal återupptaget"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Tillåt video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Appen Telefon vill använda kameran till videosamtal."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Tillåt"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Avvisa"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sw/strings.xml b/java/com/android/incallui/video/impl/res/values-sw/strings.xml
index fae85d255..74475b3f9 100644
--- a/java/com/android/incallui/video/impl/res/values-sw/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sw/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Amezima video"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video take imewashwa"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Simu imesitishwa"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Simu sasa inaendelea"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Je, unataka kuruhusu video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Programu ya Simu inataka kutumia kamera yako kwa ajili ya Hangout za Video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Ruhusu"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Kataa"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ta/strings.xml b/java/com/android/incallui/video/impl/res/values-ta/strings.xml
index 07172ecd8..baaced68f 100644
--- a/java/com/android/incallui/video/impl/res/values-ta/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ta/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"பிறரின் வீடியோ ஆஃப்"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"அவரின் வீடியோ இயக்கப்பட்டுள்ளது"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"அழைப்பு ஹோல்டில்"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"மீண்டும் தொடங்கப்பட்டது"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"வீடியோவை அனுமதிக்கவா?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"வீடியோ அழைப்புகளுக்கு உங்கள் கேமராவைப் பயன்படுத்த, மொபைல் பயன்பாடு அனுமதி கோருகிறது."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"அனுமதி"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"நிராகரி"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-te/strings.xml b/java/com/android/incallui/video/impl/res/values-te/strings.xml
index 80fd1f616..8724be4e3 100644
--- a/java/com/android/incallui/video/impl/res/values-te/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-te/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"వారి వీడియో ఆఫ్‌లో ఉంది"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"వారి వీడియో ఆన్‌లో ఉంది"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"కాల్ హోల్డ్‌లో ఉంది"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"కాల్ పునఃప్రారంభించబడింది"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"వీడియోను అనుమతించాలా?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"ఫోన్ అనువర్తనం వీడియో కాల్‌ల కోసం మీ కెమెరాను ఉపయోగించాలనుకుంటోంది."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"అనుమతించు"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"తిరస్కరించు"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-th/strings.xml b/java/com/android/incallui/video/impl/res/values-th/strings.xml
index fe58ddaf6..f3a2cb54b 100644
--- a/java/com/android/incallui/video/impl/res/values-th/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-th/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"วิดีโอปิดอยู่"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"วิดีโอของผู้ใช้เปิดอยู่"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"มีการพักสาย"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"โทรต่อ"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"อนุญาตให้ใช้วิดีโอไหม"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"แอปโทรศัพท์ต้องการใช้กล้องเพื่อโทรแบบวิดีโอ"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"อนุญาต"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"ปฏิเสธ"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-tl/strings.xml b/java/com/android/incallui/video/impl/res/values-tl/strings.xml
index 6fcc6d58a..ca910975e 100644
--- a/java/com/android/incallui/video/impl/res/values-tl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-tl/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Off ang video nila"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Naka-on ang video nila"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Naka-hold ang tawag"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Itinuloy ang tawag"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Payagan ang video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Gustong gamitin ng app na Telepono ang iyong camera para sa mga video call."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Payagan"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Tanggihan"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-tr/strings.xml b/java/com/android/incallui/video/impl/res/values-tr/strings.xml
index 291f977f4..1cd4a6761 100644
--- a/java/com/android/incallui/video/impl/res/values-tr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-tr/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videosu kapalı"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video açık"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Çağrı beklemede"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Çağrı sürdürüldü"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Videoya izin verilsin mi?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon uygulaması, görüntülü görüşmeler için kameranızı kullanmak istiyor."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"İzin ver"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Reddet"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-uk/strings.xml b/java/com/android/incallui/video/impl/res/values-uk/strings.xml
index d9a47484c..c450c6234 100644
--- a/java/com/android/incallui/video/impl/res/values-uk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-uk/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Відео абон. вимкнено"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Відео співрозмовника ввімкнено"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Виклик утримується"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Дзвінок відновлено"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Увімкнути відео?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Додаток Телефон запитує дозволу використовувати камеру для відеодзвінків."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Дозволити"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Відмовити"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ur/strings.xml b/java/com/android/incallui/video/impl/res/values-ur/strings.xml
index 3df2621a3..798681d85 100644
--- a/java/com/android/incallui/video/impl/res/values-ur/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ur/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"ان کی ویڈیو آف ہے"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"ان کی ویڈیو آن ہے"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"کال ہولڈ پر ہے"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"کال دوبارہ شروع ہو گئی"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"ویڈیو کی اجازت دیں؟"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"فون ایپ ویڈیو کالز کیلئے آپ کا کیمرا استعمال کرنا چاہتی ہے۔"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"اجازت دیں"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"مسترد کریں"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-uz/strings.xml b/java/com/android/incallui/video/impl/res/values-uz/strings.xml
index c3d302b92..cf92b1ec3 100644
--- a/java/com/android/incallui/video/impl/res/values-uz/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-uz/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Suhbatdosh video kamerasi o‘chiq"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Suhbatdosh kamerasi yoniq"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Kutish holatida"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Qo‘ng‘iroq tiklandi"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Kamera yoqilsinmi?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Telefon ilovasi video qo‘ng‘iroqlar uchun kamerangizdan foydalanishga ruxsat so‘ramoqda."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Ruxsat berish"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Rad etish"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-vi/strings.xml b/java/com/android/incallui/video/impl/res/values-vi/strings.xml
index 5b78ebece..442ec7e31 100644
--- a/java/com/android/incallui/video/impl/res/values-vi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-vi/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video của họ đã tắt"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video của họ đang bật"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Cuộc gọi đang chờ"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Đã tiếp tục cuộc gọi"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Cho phép video?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Ứng dụng Điện thoại muốn sử dụng máy ảnh của bạn cho cuộc gọi điện video."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Cho phép"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Từ chối"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
index a53fb6404..e9e7f9e8b 100644
--- a/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
@@ -19,5 +19,5 @@
   <dimen name="videocall_button_size">72dp</dimen>
   <dimen name="videocall_preview_width">88dp</dimen>
   <dimen name="videocall_preview_height">88dp</dimen>
-  <dimen name="videocall_preview_long">104dp</dimen>
+  <dimen name="videocall_preview_long">116dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
index f88561ed1..6c0d350f4 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"对方的视频画面已关闭"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"对方已开启视频功能"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"保持的通话"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通话已恢复"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"允许使用摄像头？"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"“电话”应用需要使用摄像头进行视频通话。"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"允许"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"拒绝"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
index 5590c8c38..2ac6a477e 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"他們已關閉視像功能"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"另一方已開啟視像功能"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"通話目前保留"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通話繼續"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"允許視像？"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"手機應用程式希望使用您的相機進行視像通話。"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"允許"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"拒絕"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
index 0e4e21f8e..115822a5f 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"對方的視訊畫面已關閉"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"對方已開啟視訊畫面"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"通話保留中"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"已恢復通話"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"要允許應用程式存取攝影機嗎？"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"「電話」應用程式要求存取你的攝影機，以便進行視訊通話。"</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"允許"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"拒絕"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zu/strings.xml b/java/com/android/incallui/video/impl/res/values-zu/strings.xml
index 414ddf107..0752e52da 100644
--- a/java/com/android/incallui/video/impl/res/values-zu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zu/strings.xml
@@ -1,12 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="videocall_remote_video_off" msgid="2959680546745902547">"Ividiyo yabo ivaliwe"</string>
     <string name="videocall_remote_video_on" msgid="6011817851703181639">"Ividiyo yabo ivuliwe"</string>
     <string name="videocall_remotely_held" msgid="1295702896355732947">"Ikholi imisiwe"</string>
     <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Ikholi iqaliswe kabusha"</string>
-    <string name="camera_permission_dialog_title" msgid="4901760354830982117">"Vumela ividiyo?"</string>
-    <string name="camera_permission_dialog_message" msgid="2677490854794162699">"Uhlelo lokusebenza lwefoni lifuna ukusebenzisela ikhamera yakho amakholi evidiyo."</string>
-    <string name="camera_permission_dialog_positive_button" msgid="9075818030671161374">"Vumela"</string>
-    <string name="camera_permission_dialog_negative_button" msgid="7538535842403837541">"Nqaba"</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values/dimens.xml b/java/com/android/incallui/video/impl/res/values/dimens.xml
index aa08c9d6d..606b158d9 100644
--- a/java/com/android/incallui/video/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values/dimens.xml
@@ -17,7 +17,7 @@
 <resources>
   <dimen name="videocall_preview_width">72dp</dimen>
   <dimen name="videocall_preview_height">72dp</dimen>
-  <dimen name="videocall_preview_long">84dp</dimen>
+  <dimen name="videocall_preview_long">96dp</dimen>
   <dimen name="videocall_preview_margin_bottom">24dp</dimen>
   <dimen name="videocall_preview_margin_start">24dp</dimen>
   <dimen name="videocall_preview_margin_end">24dp</dimen>
diff --git a/java/com/android/incallui/video/impl/res/values/strings.xml b/java/com/android/incallui/video/impl/res/values/strings.xml
index 2b72b8004..58ea8bde7 100644
--- a/java/com/android/incallui/video/impl/res/values/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values/strings.xml
@@ -1,4 +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>
 
   <!-- Text indicates the video from remote party is off. [CHAR LIMIT=40] -->
@@ -13,16 +29,4 @@
   <!-- Text indicates the call is resumed from held by remote party. [CHAR LIMIT=20] -->
   <string name="videocall_remotely_resumed">Call resumed</string>
 
-  <!-- Title of dialog to ask user for camera permission. [CHAR LIMIT=30] -->
-  <string name="camera_permission_dialog_title">Allow video?</string>
-
-  <!-- Message of dialog to ask user for camera permission. [CHAR LIMIT=100] -->
-  <string name="camera_permission_dialog_message">The Phone app wants to use your camera for video calls.</string>
-
-  <!-- Text of button to be confirmed for camera permission by user. [CHAR LIMIT=20] -->
-  <string name="camera_permission_dialog_positive_button">Allow</string>
-
-  <!-- Text of button to be declined for camera permission by user. [CHAR LIMIT=20] -->
-  <string name="camera_permission_dialog_negative_button">Deny</string>
-
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values/styles.xml b/java/com/android/incallui/video/impl/res/values/styles.xml
index f73075f09..010aca2d1 100644
--- a/java/com/android/incallui/video/impl/res/values/styles.xml
+++ b/java/com/android/incallui/video/impl/res/values/styles.xml
@@ -23,7 +23,8 @@
     <item name="android:stateListAnimator">@animator/disabled_alpha</item>
   </style>
   <style name="VideoPreviewHolder">
-    <item name="android:layout_gravity">bottom|start</item>
+    <item name="android:layout_alignParentBottom">true</item>
+    <item name="android:layout_alignParentStart">true</item>
     <item name="android:layout_width">@dimen/videocall_preview_width</item>
     <item name="android:layout_height">@dimen/videocall_preview_long</item>
     <item name="android:layout_marginBottom">@dimen/videocall_preview_margin_bottom</item>
diff --git a/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java b/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java
index e7e69df2f..55ea23f5e 100644
--- a/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java
+++ b/java/com/android/incallui/video/protocol/VideoCallScreenDelegate.java
@@ -37,7 +37,7 @@ public interface VideoCallScreenDelegate {
 
   void onCameraPermissionGranted();
 
-  boolean shouldShowCameraPermissionDialog();
+  boolean shouldShowCameraPermissionToast();
 
   void onCameraPermissionDialogShown();