Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev

23 files changed, 1 insertions, 1 deletions

diff --git a/res/drawable-hdpi/ic_camera_blanket.png b/res/drawable-hdpi/ic_camera_blanket.png
index 26307015a..c4e60e5a0 100644
--- a/res/drawable-hdpi/ic_camera_blanket.png
+++ b/res/drawable-hdpi/ic_camera_blanket.png
diff --git a/res/drawable-hdpi/ic_video_blanket.png b/res/drawable-hdpi/ic_video_blanket.png
index 6ec9d1249..d6f2e4638 100644
--- a/res/drawable-hdpi/ic_video_blanket.png
+++ b/res/drawable-hdpi/ic_video_blanket.png
diff --git a/res/drawable-mdpi/ic_camera_blanket.png b/res/drawable-mdpi/ic_camera_blanket.png
index 8d2e6601c..3fc64003b 100644
--- a/res/drawable-mdpi/ic_camera_blanket.png
+++ b/res/drawable-mdpi/ic_camera_blanket.png
diff --git a/res/drawable-mdpi/ic_video_blanket.png b/res/drawable-mdpi/ic_video_blanket.png
index bea42e1e3..db57c4388 100644
--- a/res/drawable-mdpi/ic_video_blanket.png
+++ b/res/drawable-mdpi/ic_video_blanket.png
diff --git a/res/drawable-xhdpi/ic_camera_blanket.png b/res/drawable-xhdpi/ic_camera_blanket.png
index 26fcae4c5..2d666539e 100644
--- a/res/drawable-xhdpi/ic_camera_blanket.png
+++ b/res/drawable-xhdpi/ic_camera_blanket.png
diff --git a/res/drawable-xhdpi/ic_video_blanket.png b/res/drawable-xhdpi/ic_video_blanket.png
index da017fdec..790313c50 100644
--- a/res/drawable-xhdpi/ic_video_blanket.png
+++ b/res/drawable-xhdpi/ic_video_blanket.png
diff --git a/res/drawable-xxhdpi/ic_camera_blanket.png b/res/drawable-xxhdpi/ic_camera_blanket.png
index 1799adcc3..b70de307e 100644
--- a/res/drawable-xxhdpi/ic_camera_blanket.png
+++ b/res/drawable-xxhdpi/ic_camera_blanket.png
diff --git a/res/drawable-xxhdpi/ic_video_blanket.png b/res/drawable-xxhdpi/ic_video_blanket.png
index 60504378f..d66dbd174 100644
--- a/res/drawable-xxhdpi/ic_video_blanket.png
+++ b/res/drawable-xxhdpi/ic_video_blanket.png
diff --git a/res/drawable-xxxhdpi/ic_camera_blanket.png b/res/drawable-xxxhdpi/ic_camera_blanket.png
index a896d466b..717dca2c9 100644
--- a/res/drawable-xxxhdpi/ic_camera_blanket.png
+++ b/res/drawable-xxxhdpi/ic_camera_blanket.png
diff --git a/res/drawable-xxxhdpi/ic_video_blanket.png b/res/drawable-xxxhdpi/ic_video_blanket.png
index 23caf41ba..758efefa7 100644
--- a/res/drawable-xxxhdpi/ic_video_blanket.png
+++ b/res/drawable-xxxhdpi/ic_video_blanket.png
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 125533480..2dd796cd3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -179,7 +179,7 @@
     <dimen name="camera_controls_padding_start">36dp</dimen>
     <dimen name="camera_controls_padding_end">36dp</dimen>
 
-    <dimen name="mode_transition_view_icon_size">144dp</dimen>
+    <dimen name="mode_transition_view_icon_size">64dp</dimen>
     <dimen name="flash_circle_size_after_shrink">36dp</dimen>
 
     <dimen name="mode_options_height">72dp</dimen>
diff --git a/res_p/drawable-hdpi/ic_pano_blanket.png b/res_p/drawable-hdpi/ic_pano_blanket.png
index eecd5cbc8..3a9fc7bb9 100644
--- a/res_p/drawable-hdpi/ic_pano_blanket.png
+++ b/res_p/drawable-hdpi/ic_pano_blanket.png
diff --git a/res_p/drawable-hdpi/ic_photosphere_blanket.png b/res_p/drawable-hdpi/ic_photosphere_blanket.png
index c667cc654..8912ca006 100644
--- a/res_p/drawable-hdpi/ic_photosphere_blanket.png
+++ b/res_p/drawable-hdpi/ic_photosphere_blanket.png
diff --git a/res_p/drawable-hdpi/ic_refocus_blanket.png b/res_p/drawable-hdpi/ic_refocus_blanket.png
index b260afef6..81a2707df 100644
--- a/res_p/drawable-hdpi/ic_refocus_blanket.png
+++ b/res_p/drawable-hdpi/ic_refocus_blanket.png
diff --git a/res_p/drawable-mdpi/ic_pano_blanket.png b/res_p/drawable-mdpi/ic_pano_blanket.png
index 42c0c37a4..b48b1a3e2 100644
--- a/res_p/drawable-mdpi/ic_pano_blanket.png
+++ b/res_p/drawable-mdpi/ic_pano_blanket.png
diff --git a/res_p/drawable-mdpi/ic_photosphere_blanket.png b/res_p/drawable-mdpi/ic_photosphere_blanket.png
index 1db0e499e..19fba8dd4 100644
--- a/res_p/drawable-mdpi/ic_photosphere_blanket.png
+++ b/res_p/drawable-mdpi/ic_photosphere_blanket.png
diff --git a/res_p/drawable-mdpi/ic_refocus_blanket.png b/res_p/drawable-mdpi/ic_refocus_blanket.png
index 8cfaa2c77..303f081e1 100644
--- a/res_p/drawable-mdpi/ic_refocus_blanket.png
+++ b/res_p/drawable-mdpi/ic_refocus_blanket.png
diff --git a/res_p/drawable-xhdpi/ic_pano_blanket.png b/res_p/drawable-xhdpi/ic_pano_blanket.png
index 9f313e268..f69d872fb 100644
--- a/res_p/drawable-xhdpi/ic_pano_blanket.png
+++ b/res_p/drawable-xhdpi/ic_pano_blanket.png
diff --git a/res_p/drawable-xhdpi/ic_photosphere_blanket.png b/res_p/drawable-xhdpi/ic_photosphere_blanket.png
index e7306d3c5..07a9798e1 100644
--- a/res_p/drawable-xhdpi/ic_photosphere_blanket.png
+++ b/res_p/drawable-xhdpi/ic_photosphere_blanket.png
diff --git a/res_p/drawable-xhdpi/ic_refocus_blanket.png b/res_p/drawable-xhdpi/ic_refocus_blanket.png
index 156c8f4e7..db7ffd7b2 100644
--- a/res_p/drawable-xhdpi/ic_refocus_blanket.png
+++ b/res_p/drawable-xhdpi/ic_refocus_blanket.png
diff --git a/res_p/drawable-xxhdpi/ic_pano_blanket.png b/res_p/drawable-xxhdpi/ic_pano_blanket.png
index ff33adcd2..f0f1a2678 100644
--- a/res_p/drawable-xxhdpi/ic_pano_blanket.png
+++ b/res_p/drawable-xxhdpi/ic_pano_blanket.png
diff --git a/res_p/drawable-xxhdpi/ic_photosphere_blanket.png b/res_p/drawable-xxhdpi/ic_photosphere_blanket.png
index 54d0360a3..4d710f776 100644
--- a/res_p/drawable-xxhdpi/ic_photosphere_blanket.png
+++ b/res_p/drawable-xxhdpi/ic_photosphere_blanket.png
diff --git a/res_p/drawable-xxhdpi/ic_refocus_blanket.png b/res_p/drawable-xxhdpi/ic_refocus_blanket.png
index b4c4239cb..5261068af 100644
--- a/res_p/drawable-xxhdpi/ic_refocus_blanket.png
+++ b/res_p/drawable-xxhdpi/ic_refocus_blanket.png