summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2014-11-14 10:02:13 -0500
committerAlan Newberger <alann@google.com>2014-11-14 20:32:36 +0000
commit3384c81415b7671fae9a5da806ac103d03d8195a (patch)
treebc5cd5d7f893bb754dfea607c09cafe8cc8456ba /res
parent9ae303df246577ee1293ef8e731e18ae63f4d3c9 (diff)
downloadandroid_packages_apps_Camera2-3384c81415b7671fae9a5da806ac103d03d8195a.tar.gz
android_packages_apps_Camera2-3384c81415b7671fae9a5da806ac103d03d8195a.tar.bz2
android_packages_apps_Camera2-3384c81415b7671fae9a5da806ac103d03d8195a.zip
Trim transparent pixels off camera preview bitmaps.
Since SysUI holds these bitmaps in memory for jank-free drawing, these pixels are just wasted RAM. Since the transition code assumes uniform square bitmaps, these are all 64x64dp, which is still a teensy bit wasteful but much better than before (144x144dp). Bug: 18369196 Change-Id: Idf10b2048190ac44eff3e5da467149c460067347
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_camera_blanket.pngbin1548 -> 1150 bytes
-rw-r--r--res/drawable-hdpi/ic_video_blanket.pngbin570 -> 458 bytes
-rw-r--r--res/drawable-mdpi/ic_camera_blanket.pngbin1052 -> 900 bytes
-rw-r--r--res/drawable-mdpi/ic_video_blanket.pngbin405 -> 369 bytes
-rw-r--r--res/drawable-xhdpi/ic_camera_blanket.pngbin2257 -> 1653 bytes
-rw-r--r--res/drawable-xhdpi/ic_video_blanket.pngbin803 -> 568 bytes
-rw-r--r--res/drawable-xxhdpi/ic_camera_blanket.pngbin3120 -> 2486 bytes
-rw-r--r--res/drawable-xxhdpi/ic_video_blanket.pngbin1719 -> 776 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_camera_blanket.pngbin4520 -> 3279 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_video_blanket.pngbin2074 -> 1047 bytes
-rw-r--r--res/values/dimens.xml2
11 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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>