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

commit: 005533a92a3b56ef8bceb456063ed0ac12c767cf [log] [tgz]
author: Dan Sandler <dsandler@android.com> Fri Nov 14 20:08:57 2014 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Fri Nov 14 20:08:58 2014 +0000
tree: e18bf53ba0934a3d70ccdb42d013def34551b884
parent: bc6bb3b6428d7e41282d3d171d73f5305b04c437 [diff]
parent: b7a22419659b11e28cddf43c60feeddf468ff295 [diff]
diff --git a/res/drawable-hdpi/ic_camera_blanket.png b/res/drawable-hdpi/ic_camera_blanket.png
index 2630701..c4e60e5 100644
--- a/res/drawable-hdpi/ic_camera_blanket.png
+++ b/res/drawable-hdpi/ic_camera_blanket.png
Binary files differ

diff --git a/res/drawable-hdpi/ic_video_blanket.png b/res/drawable-hdpi/ic_video_blanket.png
index 6ec9d12..d6f2e46 100644
--- a/res/drawable-hdpi/ic_video_blanket.png
+++ b/res/drawable-hdpi/ic_video_blanket.png
Binary files differ

diff --git a/res/drawable-mdpi/ic_camera_blanket.png b/res/drawable-mdpi/ic_camera_blanket.png
index 8d2e660..3fc6400 100644
--- a/res/drawable-mdpi/ic_camera_blanket.png
+++ b/res/drawable-mdpi/ic_camera_blanket.png
Binary files differ

diff --git a/res/drawable-mdpi/ic_video_blanket.png b/res/drawable-mdpi/ic_video_blanket.png
index bea42e1..db57c43 100644
--- a/res/drawable-mdpi/ic_video_blanket.png
+++ b/res/drawable-mdpi/ic_video_blanket.png
Binary files differ

diff --git a/res/drawable-xhdpi/ic_camera_blanket.png b/res/drawable-xhdpi/ic_camera_blanket.png
index 26fcae4..2d66653 100644
--- a/res/drawable-xhdpi/ic_camera_blanket.png
+++ b/res/drawable-xhdpi/ic_camera_blanket.png
Binary files differ

diff --git a/res/drawable-xhdpi/ic_video_blanket.png b/res/drawable-xhdpi/ic_video_blanket.png
index da017fd..790313c 100644
--- a/res/drawable-xhdpi/ic_video_blanket.png
+++ b/res/drawable-xhdpi/ic_video_blanket.png
Binary files differ

diff --git a/res/drawable-xxhdpi/ic_camera_blanket.png b/res/drawable-xxhdpi/ic_camera_blanket.png
index 1799adc..b70de30 100644
--- a/res/drawable-xxhdpi/ic_camera_blanket.png
+++ b/res/drawable-xxhdpi/ic_camera_blanket.png
Binary files differ

diff --git a/res/drawable-xxhdpi/ic_video_blanket.png b/res/drawable-xxhdpi/ic_video_blanket.png
index 6050437..d66dbd1 100644
--- a/res/drawable-xxhdpi/ic_video_blanket.png
+++ b/res/drawable-xxhdpi/ic_video_blanket.png
Binary files differ

diff --git a/res/drawable-xxxhdpi/ic_camera_blanket.png b/res/drawable-xxxhdpi/ic_camera_blanket.png
index a896d46..717dca2 100644
--- a/res/drawable-xxxhdpi/ic_camera_blanket.png
+++ b/res/drawable-xxxhdpi/ic_camera_blanket.png
Binary files differ

diff --git a/res/drawable-xxxhdpi/ic_video_blanket.png b/res/drawable-xxxhdpi/ic_video_blanket.png
index 23caf41..758efef 100644
--- a/res/drawable-xxxhdpi/ic_video_blanket.png
+++ b/res/drawable-xxxhdpi/ic_video_blanket.png
Binary files differ

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1255334..2dd796c 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 eecd5cb..3a9fc7b 100644
--- a/res_p/drawable-hdpi/ic_pano_blanket.png
+++ b/res_p/drawable-hdpi/ic_pano_blanket.png
Binary files differ

diff --git a/res_p/drawable-hdpi/ic_photosphere_blanket.png b/res_p/drawable-hdpi/ic_photosphere_blanket.png
index c667cc6..8912ca0 100644
--- a/res_p/drawable-hdpi/ic_photosphere_blanket.png
+++ b/res_p/drawable-hdpi/ic_photosphere_blanket.png
Binary files differ

diff --git a/res_p/drawable-hdpi/ic_refocus_blanket.png b/res_p/drawable-hdpi/ic_refocus_blanket.png
index b260afe..81a2707 100644
--- a/res_p/drawable-hdpi/ic_refocus_blanket.png
+++ b/res_p/drawable-hdpi/ic_refocus_blanket.png
Binary files differ

diff --git a/res_p/drawable-mdpi/ic_pano_blanket.png b/res_p/drawable-mdpi/ic_pano_blanket.png
index 42c0c37..b48b1a3 100644
--- a/res_p/drawable-mdpi/ic_pano_blanket.png
+++ b/res_p/drawable-mdpi/ic_pano_blanket.png
Binary files differ

diff --git a/res_p/drawable-mdpi/ic_photosphere_blanket.png b/res_p/drawable-mdpi/ic_photosphere_blanket.png
index 1db0e49..19fba8d 100644
--- a/res_p/drawable-mdpi/ic_photosphere_blanket.png
+++ b/res_p/drawable-mdpi/ic_photosphere_blanket.png
Binary files differ

diff --git a/res_p/drawable-mdpi/ic_refocus_blanket.png b/res_p/drawable-mdpi/ic_refocus_blanket.png
index 8cfaa2c..303f081 100644
--- a/res_p/drawable-mdpi/ic_refocus_blanket.png
+++ b/res_p/drawable-mdpi/ic_refocus_blanket.png
Binary files differ

diff --git a/res_p/drawable-xhdpi/ic_pano_blanket.png b/res_p/drawable-xhdpi/ic_pano_blanket.png
index 9f313e2..f69d872 100644
--- a/res_p/drawable-xhdpi/ic_pano_blanket.png
+++ b/res_p/drawable-xhdpi/ic_pano_blanket.png
Binary files differ

diff --git a/res_p/drawable-xhdpi/ic_photosphere_blanket.png b/res_p/drawable-xhdpi/ic_photosphere_blanket.png
index e7306d3..07a9798 100644
--- a/res_p/drawable-xhdpi/ic_photosphere_blanket.png
+++ b/res_p/drawable-xhdpi/ic_photosphere_blanket.png
Binary files differ

diff --git a/res_p/drawable-xhdpi/ic_refocus_blanket.png b/res_p/drawable-xhdpi/ic_refocus_blanket.png
index 156c8f4..db7ffd7 100644
--- a/res_p/drawable-xhdpi/ic_refocus_blanket.png
+++ b/res_p/drawable-xhdpi/ic_refocus_blanket.png
Binary files differ

diff --git a/res_p/drawable-xxhdpi/ic_pano_blanket.png b/res_p/drawable-xxhdpi/ic_pano_blanket.png
index ff33adc..f0f1a26 100644
--- a/res_p/drawable-xxhdpi/ic_pano_blanket.png
+++ b/res_p/drawable-xxhdpi/ic_pano_blanket.png
Binary files differ

diff --git a/res_p/drawable-xxhdpi/ic_photosphere_blanket.png b/res_p/drawable-xxhdpi/ic_photosphere_blanket.png
index 54d0360..4d710f7 100644
--- a/res_p/drawable-xxhdpi/ic_photosphere_blanket.png
+++ b/res_p/drawable-xxhdpi/ic_photosphere_blanket.png
Binary files differ

diff --git a/res_p/drawable-xxhdpi/ic_refocus_blanket.png b/res_p/drawable-xxhdpi/ic_refocus_blanket.png
index b4c4239..5261068 100644
--- a/res_p/drawable-xxhdpi/ic_refocus_blanket.png
+++ b/res_p/drawable-xxhdpi/ic_refocus_blanket.png
Binary files differ
commit	005533a92a3b56ef8bceb456063ed0ac12c767cf	[log] [tgz]
author	Dan Sandler <dsandler@android.com>	Fri Nov 14 20:08:57 2014 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Nov 14 20:08:58 2014 +0000
tree	e18bf53ba0934a3d70ccdb42d013def34551b884
parent	bc6bb3b6428d7e41282d3d171d73f5305b04c437 [diff]
parent	b7a22419659b11e28cddf43c60feeddf468ff295 [diff]