OSDN Git Service
Sam Hasinoff [Wed, 27 Aug 2014 22:40:59 +0000 (22:40 +0000)]
am
4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '
4f0d63848684cb7cbcde42b0bd714bb6d6f998f5':
gcam: Restore naming of Gcam debug folders.
Sam Hasinoff [Wed, 27 Aug 2014 05:12:00 +0000 (22:12 -0700)]
gcam: Restore naming of Gcam debug folders.
When Gcam debugging is on, write output to per-burst folders
named SSSS_YYYYMMDD_HHMMSS_XXX, where 'SSSS' is the last 4
digits of the device serial number and 'XXX' are the
milliseconds of the timestamp.
Bug:
17204023
Change-Id: Ie1d58dc3ecb5d9dc7389d24acc4937498f00dbc9
Puneet Lall [Wed, 27 Aug 2014 22:21:27 +0000 (22:21 +0000)]
am
2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier
* commit '
2b3cf8689d68444dcf8f56a85d8525533d9d96aa':
Add setprop to enable ZSL.
Puneet Lall [Wed, 27 Aug 2014 22:08:30 +0000 (22:08 +0000)]
Merge "Add setprop to enable ZSL." into ub-camera-glacier
Puneet Lall [Wed, 27 Aug 2014 20:38:29 +0000 (13:38 -0700)]
Add setprop to enable ZSL.
Bug:
16961251
Change-Id: I997a47345f7c277abb43f2533fa5226e0c6a3e06
Sascha Haeberling [Wed, 27 Aug 2014 21:39:49 +0000 (21:39 +0000)]
am
969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '
969d606acb2b2f6e755f9164348712306dc7b557':
Make sure CaptureModule (and therefore Gcam) always resumes right.
Sascha Haeberling [Wed, 27 Aug 2014 21:29:14 +0000 (21:29 +0000)]
Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 20:23:24 +0000 (20:23 +0000)]
am
480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
* commit '
480e58b1020f853f6c71d2c3469b342d27084752':
fix for a doublebounce of the filmstip button on filmstip swipe out
Spike Sprague [Wed, 27 Aug 2014 20:13:41 +0000 (20:13 +0000)]
Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 18:25:45 +0000 (11:25 -0700)]
fix for a doublebounce of the filmstip button on filmstip swipe out
bug:
17301367
Change-Id: I305618ee5012de229c9cc1fd73f0b6506d701477
Puneet Lall [Wed, 27 Aug 2014 19:18:31 +0000 (19:18 +0000)]
am
c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier
* commit '
c5b752589e2721c72f8b8f879838f94d816bf1f8':
Initial ZSL implementation
Puneet Lall [Wed, 27 Aug 2014 19:09:59 +0000 (19:09 +0000)]
Merge "Initial ZSL implementation" into ub-camera-glacier
Sascha Haeberling [Wed, 27 Aug 2014 19:07:58 +0000 (12:07 -0700)]
Make sure CaptureModule (and therefore Gcam) always resumes right.
Bug:
17258531
Change-Id: I8a72fcd8f34eb95676ca939c2aff87fcac105e75
Puneet Lall [Thu, 14 Aug 2014 01:53:53 +0000 (18:53 -0700)]
Initial ZSL implementation
Bug:
16961251
Change-Id: I03c7c1813f99d460495472addc7f733e1bfa6a97
Spike Sprague [Wed, 27 Aug 2014 17:44:36 +0000 (17:44 +0000)]
am
a98b4b10: Merge "boatload of new assets" into ub-camera-glacier
* commit '
a98b4b10a1ce7a6ce6499f364ae33cebbb94d023':
boatload of new assets
Spike Sprague [Wed, 27 Aug 2014 17:35:31 +0000 (17:35 +0000)]
Merge "boatload of new assets" into ub-camera-glacier
Baligh Uddin [Wed, 27 Aug 2014 16:32:43 +0000 (16:32 +0000)]
am
0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
0043d830c7ae38ae938302c8ef1c862ba87eca90':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:22:38 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Wed, 27 Aug 2014 16:22:36 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
Sascha Haeberling [Wed, 27 Aug 2014 06:04:19 +0000 (06:04 +0000)]
am
95817308: Enable location and heading to be stored in picture EXIF.
* commit '
95817308fddad554c73cbe4539cb868dd4722ff9':
Enable location and heading to be stored in picture EXIF.
Sascha Haeberling [Wed, 27 Aug 2014 01:03:22 +0000 (18:03 -0700)]
Enable location and heading to be stored in picture EXIF.
Bug:
17202845
Change-Id: Ic789c9a2d6078b35a09308d1b631166529f3f1bd
Baligh Uddin [Wed, 27 Aug 2014 04:40:15 +0000 (21:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6109471f563f3bd69201ccb82fd27c6412eab06d
Auto-generated-cl: translation import
Baligh Uddin [Wed, 27 Aug 2014 04:39:30 +0000 (21:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I785196ae077b6f1720086a546c115f6eec7e1043
Auto-generated-cl: translation import
Sascha Haeberling [Wed, 27 Aug 2014 04:38:36 +0000 (04:38 +0000)]
am
779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
* commit '
779414e8bfe23d66de310570ff2314654e45ec9f':
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Sascha Haeberling [Wed, 27 Aug 2014 04:04:52 +0000 (21:04 -0700)]
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Bug:
17204023
Change-Id: I03ac9df0e4df8f09f5a4527616add6fb12ff0fd8
Alan Newberger [Wed, 27 Aug 2014 02:28:01 +0000 (02:28 +0000)]
am
26b224dd: Protect video recording callback from activity/module pauses
* commit '
26b224dd3b4391dbbb8ee6ed35c40c431bdbec85':
Protect video recording callback from activity/module pauses
Sascha Haeberling [Wed, 27 Aug 2014 01:35:18 +0000 (01:35 +0000)]
am
d225ea60: Add volume key capture suppor to CaptureModule
* commit '
d225ea6074a58021013c8c063abb51eb80b1feb7':
Add volume key capture suppor to CaptureModule
Andy Huibers [Wed, 27 Aug 2014 01:24:59 +0000 (01:24 +0000)]
am
9d3ec039: Add timeout to touch to focus.
* commit '
9d3ec0396b71d7b9068f83b2e820eee988df8215':
Add timeout to touch to focus.
Alan Newberger [Wed, 27 Aug 2014 01:18:48 +0000 (18:18 -0700)]
Protect video recording callback from activity/module pauses
This CL should eliminate MediaRecorder start exceptions, which
appear to be due to ending the camera or switching the module.
Storage I/O could take a while during which pauses can occur,
so we check for them and avoid starting video in that case.
Bug:
16298718
Change-Id: I9abca815400e9ce545fed96f6e31cb792860a1d0
Sascha Haeberling [Wed, 27 Aug 2014 01:20:35 +0000 (18:20 -0700)]
Add volume key capture suppor to CaptureModule
Bug:
17289383
Change-Id: If548c4ebe5f702aca6fc9a983ac4775812ad551f
Andy Huibers [Wed, 27 Aug 2014 00:32:39 +0000 (17:32 -0700)]
Add timeout to touch to focus.
Bug:
17289205
Change-Id: Ide39b4b9c86691de36149fdd15d1db41f9fed342
Spike Sprague [Wed, 27 Aug 2014 00:31:53 +0000 (00:31 +0000)]
am
597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
* commit '
597c4d10b9bf0174a81e617cb89bab1a196cbc3a':
more consistently apply filmstip hide animations
Spike Sprague [Wed, 27 Aug 2014 00:17:45 +0000 (00:17 +0000)]
Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 00:09:45 +0000 (17:09 -0700)]
more consistently apply filmstip hide animations
bug:
17278732
bug:
17279637
Change-Id: I2346dcd77c0afd84eb1167ad5d5df3770551c14f
Andy Huibers [Wed, 27 Aug 2014 00:03:14 +0000 (00:03 +0000)]
am
bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit '
bd9b80b267195f78a8514847d0f02629e761a334':
Reset metering and focus areas when touch focus period ends.
Andy Huibers [Tue, 26 Aug 2014 23:21:15 +0000 (16:21 -0700)]
Reset metering and focus areas when touch focus period ends.
Bug:
17286539
Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c
Alan Newberger [Tue, 26 Aug 2014 23:19:16 +0000 (23:19 +0000)]
am
d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit '
d4d1dbe00b84285bd0d235d984b9d71ea63a9305':
Remove one shot callback workaround in VideoModule for L
Alan Newberger [Tue, 26 Aug 2014 23:11:24 +0000 (23:11 +0000)]
Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
Andy Huibers [Tue, 26 Aug 2014 23:02:40 +0000 (23:02 +0000)]
am
462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '
462d9c510bbd072c63fb5be1ec12df15b4775f5f':
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Andy Huibers [Tue, 26 Aug 2014 22:57:10 +0000 (22:57 +0000)]
Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
Spike Sprague [Tue, 26 Aug 2014 22:16:57 +0000 (22:16 +0000)]
am
91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
* commit '
9109871358e32726f23d9b4db9d6fbf55a03cddc':
Material Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 22:06:24 +0000 (22:06 +0000)]
Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
Spike Sprague [Tue, 26 Aug 2014 21:59:43 +0000 (14:59 -0700)]
Material Ripple effect on filmstip buttons
bug:
17281225
Change-Id: Ic2876527a6d1fedaeb9ecdddbc8627e1c4e396b1
Andy Huibers [Tue, 26 Aug 2014 18:16:59 +0000 (11:16 -0700)]
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Bug:
17028594
Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169
Spike Sprague [Fri, 22 Aug 2014 22:15:48 +0000 (15:15 -0700)]
boatload of new assets
also:
bug:
17255612
Change-Id: I8551e3162b8eedee9653a05abb88177e39f12be5
Ruben Brunk [Tue, 26 Aug 2014 21:06:59 +0000 (21:06 +0000)]
am
92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
* commit '
92ed7b6c6d8ca735c35f5bdc6de6d15f485e19bd':
photosphere: Fix TextureView transforms.
Ruben Brunk [Tue, 26 Aug 2014 21:00:05 +0000 (21:00 +0000)]
Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
Ruben Brunk [Tue, 26 Aug 2014 10:16:27 +0000 (03:16 -0700)]
photosphere: Fix TextureView transforms.
Bug:
17098224
- WAR to set the SurfaceTexture default buffer dimensions to
the TextureView's layout dimensions to avoid bad
scaling/translation in TextureView's HardwareLayer transform.
Change-Id: I9e7d6e6cb33d806470cb11f00d45b97218ee7c11
Alan Newberger [Thu, 21 Aug 2014 21:42:36 +0000 (14:42 -0700)]
Remove one shot callback workaround in VideoModule for L
Since there was a framework fix for the issue, we don't need
to do an extra preview callback when entering video if on L.
Bug:
16649297
Bug:
17241994
Change-Id: I67fc67ef34a661daea6991c3b895b1c1bf6b9b85
Sascha Haeberling [Tue, 26 Aug 2014 20:44:32 +0000 (20:44 +0000)]
am
afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier
* commit '
afb4c581786bb539e8753488e29a3d13fa8b43fd':
Enable mode options when capture is done.
Sascha Haeberling [Tue, 26 Aug 2014 20:36:10 +0000 (20:36 +0000)]
Merge "Enable mode options when capture is done." into ub-camera-glacier
Sascha Haeberling [Tue, 26 Aug 2014 19:15:41 +0000 (12:15 -0700)]
Enable mode options when capture is done.
Bug:
17260403
Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7
Igor Murashkin [Tue, 26 Aug 2014 17:38:02 +0000 (17:38 +0000)]
am
666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier
* commit '
666c80b054d61bd813f0eaaa527632093f80ff02':
util: Optimal preview size picks smaller-than-display size in case of tie
Igor Murashkin [Tue, 26 Aug 2014 17:30:02 +0000 (17:30 +0000)]
Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier
Andy Huibers [Tue, 26 Aug 2014 16:46:28 +0000 (16:46 +0000)]
am
c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus.
* commit '
c0fe0b6915004303a550047e68a2124edae9fdb2':
Show animated AF ring UI when lens is moving in continuous autofocus.
Andy Huibers [Tue, 26 Aug 2014 05:25:49 +0000 (22:25 -0700)]
Show animated AF ring UI when lens is moving in continuous autofocus.
Bug:
17028594
Change-Id: I0bb7c7cb3f8264304d4375f9f2b73608c8bfc1e5
Andy Huibers [Tue, 26 Aug 2014 01:41:40 +0000 (01:41 +0000)]
am
4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier
* commit '
4d04e99b46642381b1f80b2a324454ebe741c9f3':
Enable Face rectangles for debugging.
Andy Huibers [Tue, 26 Aug 2014 01:34:46 +0000 (01:34 +0000)]
Merge "Enable Face rectangles for debugging." into ub-camera-glacier
Andy Huibers [Mon, 25 Aug 2014 22:01:25 +0000 (15:01 -0700)]
Enable Face rectangles for debugging.
Bug:
17028594
Change-Id: I57521aed991f93da1f5abdace6a72be0f1057dbe
Sascha Haeberling [Mon, 25 Aug 2014 22:07:37 +0000 (22:07 +0000)]
am
46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier
* commit '
46b3c730aa059bf5103922ae0c36c13a12e98223':
Fix crash on Shamu since it's no longer camera 2 FULL.
Sascha Haeberling [Mon, 25 Aug 2014 22:00:25 +0000 (22:00 +0000)]
Merge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera-glacier
Sascha Haeberling [Mon, 25 Aug 2014 21:37:42 +0000 (14:37 -0700)]
Fix crash on Shamu since it's no longer camera 2 FULL.
Bug:
17258194
Shamu is no longer a FULL camera2 device. So we change our OneCamera API
to create a V2 manager for partial deviced as well (but exclude legacy).
Change-Id: Ic095a754494047bc18d6e5e729bd9dd8a915753c
Igor Murashkin [Mon, 25 Aug 2014 20:21:26 +0000 (13:21 -0700)]
util: Optimal preview size picks smaller-than-display size in case of tie
This fixes the case when 1600x1200 was selected over 1280x960 on a
Nexus 5 (display size 1920x1080); both preview sizes were equally close,
but the larger one was arbitrarily winning out.
Bug:
17216523
Change-Id: I163c29d5f46ad1b8b44825424c5202eb87855048
Spike Sprague [Mon, 25 Aug 2014 18:11:54 +0000 (18:11 +0000)]
am
4cc78bb3: set actionbar background to complete transparent
* commit '
4cc78bb37f57f1499fe3d2eaf27e2a3b3e2e19bf':
set actionbar background to complete transparent
Spike Sprague [Thu, 21 Aug 2014 17:16:10 +0000 (10:16 -0700)]
set actionbar background to complete transparent
bug:
17114270
Change-Id: I309c98ed1ddbc0c322129e185ca4cd2df1f73520
Sascha Haeberling [Sat, 23 Aug 2014 02:05:16 +0000 (02:05 +0000)]
am
392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
* commit '
392f249b8295509cf6c31984f2420b876ca5a7ac':
Enable switching within CaptureModule to HDR+ and back.
Sascha Haeberling [Sat, 23 Aug 2014 01:57:51 +0000 (01:57 +0000)]
Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
Sascha Haeberling [Thu, 21 Aug 2014 17:01:00 +0000 (10:01 -0700)]
Enable switching within CaptureModule to HDR+ and back.
Bug:
16945820
Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1
Sol Boucher [Sat, 23 Aug 2014 01:38:39 +0000 (01:38 +0000)]
am
799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier
* commit '
799acabb5105aa1095740771457ce037422e492e':
Switch from stepwise index-based zoom to a ratio-based scale
Sol Boucher [Sat, 23 Aug 2014 01:30:24 +0000 (01:30 +0000)]
Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier
Sol Boucher [Wed, 20 Aug 2014 00:24:07 +0000 (17:24 -0700)]
Switch from stepwise index-based zoom to a ratio-based scale
This brings the app up to date with the removal of the deprecated zoom methods
in the portability layer's CameraSettings class.
Bug:
17016658
Change-Id: Icb9f773188f7481d9af991d71feaff86379f5525
Baligh Uddin [Fri, 22 Aug 2014 17:44:18 +0000 (17:44 +0000)]
am
6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
6a836bffd12d036e3c85c29134f2ada14df3c2f1':
Import translations. DO NOT MERGE
Spike Sprague [Fri, 22 Aug 2014 17:44:18 +0000 (17:44 +0000)]
am
0dec43e3: filmstrip actionbar tweaks
* commit '
0dec43e3d77fd1f40093f2f3430a6e86d8d5307b':
filmstrip actionbar tweaks
Baligh Uddin [Fri, 22 Aug 2014 17:39:45 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Baligh Uddin [Fri, 22 Aug 2014 17:39:40 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
Spike Sprague [Wed, 20 Aug 2014 01:53:41 +0000 (18:53 -0700)]
filmstrip actionbar tweaks
bug:
17114274
Change-Id: I70e7b285d27f81c87442bcc9d28ae7391d028568
Spike Sprague [Fri, 22 Aug 2014 17:20:03 +0000 (17:20 +0000)]
am
fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier
* commit '
fe1af189505e39b2d86af5b9fcec12f1661d1509':
filmstrip actionbar tweaks
Spike Sprague [Fri, 22 Aug 2014 17:12:09 +0000 (17:12 +0000)]
Merge "filmstrip actionbar tweaks" into ub-camera-glacier
Spike Sprague [Wed, 20 Aug 2014 01:53:41 +0000 (18:53 -0700)]
filmstrip actionbar tweaks
bug:
17114274
Change-Id: I0e9b3dd37325d39f5a16d81cbfaf71b98baf7510
Sascha Haeberling [Fri, 22 Aug 2014 00:57:44 +0000 (00:57 +0000)]
am
f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier
* commit '
f859793dddc0176774eb5bac28910e9783484d97':
Pick the preview size based on the selected picture size.
Sascha Haeberling [Fri, 22 Aug 2014 00:49:21 +0000 (00:49 +0000)]
Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier
Spike Sprague [Thu, 21 Aug 2014 18:31:03 +0000 (18:31 +0000)]
am
ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen
* commit '
ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2':
animate filmstrip bottom button bar in and out from the bottom of the screen
Sascha Haeberling [Thu, 21 Aug 2014 17:04:35 +0000 (10:04 -0700)]
Pick the preview size based on the selected picture size.
Bug:
16654225
Also make this a function of the Camera device, since othe camera might
have to override the picture size.
Change-Id: Ieb6d1ffac0c3d7893416f9eae3232afde6d27240
Spike Sprague [Tue, 19 Aug 2014 22:33:45 +0000 (15:33 -0700)]
animate filmstrip bottom button bar in and out
from the bottom of the screen
bug:
17114515
Change-Id: If3024f149fc0be0e48a430468c53774893946938
Sascha Haeberling [Thu, 21 Aug 2014 00:51:56 +0000 (00:51 +0000)]
am
0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
* commit '
0382139c99988f0002afeafb4c35f3599b1fc02f':
Enable progress reporting for modules like HDR+.
Senpo Hu [Thu, 21 Aug 2014 00:24:24 +0000 (00:24 +0000)]
am
5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier
* commit '
5b88f9a77fc997b922f99f0f5ec956b9caee42f9':
Change Shamu's default video resolution setting.
Sascha Haeberling [Thu, 21 Aug 2014 00:40:31 +0000 (00:40 +0000)]
Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
Sol Boucher [Thu, 21 Aug 2014 00:07:13 +0000 (00:07 +0000)]
am
dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier
* commit '
dab267ce77074883e7a3dd83f45c7722c16786dc':
TextureViewHelper workaround for SurfaceTexture/CameraProxy race
Sascha Haeberling [Wed, 20 Aug 2014 23:14:29 +0000 (16:14 -0700)]
Enable progress reporting for modules like HDR+.
Bug:
16945820
Change-Id: If6aba8ff5d2b973f4ea8112110695a84f897d881
Senpo Hu [Thu, 21 Aug 2014 00:16:11 +0000 (00:16 +0000)]
Merge "Change Shamu's default video resolution setting." into ub-camera-glacier
Senpo Hu [Mon, 18 Aug 2014 23:45:45 +0000 (16:45 -0700)]
Change Shamu's default video resolution setting.
Bug:
17060480
Change-Id: I5ce8d2d2960d21856c0f13e9599d80b0edc03ec9
Andy Huibers [Wed, 20 Aug 2014 20:56:39 +0000 (20:56 +0000)]
am
2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
* commit '
2440815caec484357250ddf0442e7cde2f4241ca':
Add zoom to CaptureModule and OneCamera.
Sascha Haeberling [Wed, 20 Aug 2014 19:31:51 +0000 (19:31 +0000)]
Sascha Haeberling [Wed, 20 Aug 2014 19:20:35 +0000 (12:20 -0700)]
Remove logspam
Bug:
17157295
Change-Id: I7b6b505a7d389b59ae440dde7b30da78aaefa0c0
Andy Huibers [Wed, 20 Aug 2014 20:49:21 +0000 (20:49 +0000)]
Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
Andy Huibers [Wed, 20 Aug 2014 07:02:19 +0000 (00:02 -0700)]
Add zoom to CaptureModule and OneCamera.
Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a
Alan Newberger [Wed, 20 Aug 2014 02:15:24 +0000 (02:15 +0000)]
am
08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier
* commit '
08c219b7ae2e32985eda869add10afa894f7140b':
Update AOSP Camera product icon
Alan Newberger [Wed, 20 Aug 2014 02:09:24 +0000 (02:09 +0000)]
Merge "Update AOSP Camera product icon" into ub-camera-glacier
Alan Newberger [Wed, 20 Aug 2014 01:53:30 +0000 (18:53 -0700)]
Update AOSP Camera product icon
Final updates for the icon. Keeping naming consistent with generated
assets.
Bug:
16985499
Change-Id: I389c2479b208dec05a0b3a1f2617d13b15913dcb
Sascha Haeberling [Tue, 19 Aug 2014 22:40:40 +0000 (22:40 +0000)]
am
6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
* commit '
6d7ed7016f28c240ae4901d076fc7f9583785c76':
roduce debug output for android.util.Pair