OSDN Git Service
Andy Huibers [Sat, 30 Aug 2014 00:26:15 +0000 (00:26 +0000)]
am
a394ea69: am
b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
* commit '
a394ea695b3ac0b09f370cba5d47e732762d690e':
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Andy Huibers [Sat, 30 Aug 2014 00:17:29 +0000 (00:17 +0000)]
am
b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
* commit '
b868274c9dc8d9c772ec89fb5955215cc7911087':
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Andy Huibers [Wed, 27 Aug 2014 22:28:42 +0000 (15:28 -0700)]
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Bug:
17202848
Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f
Puneet Lall [Fri, 29 Aug 2014 03:37:29 +0000 (03:37 +0000)]
Puneet Lall [Fri, 29 Aug 2014 03:35:37 +0000 (03:35 +0000)]
am
42b0b25e: am
d308d001: Add missing copyright header in Open Source code.
* commit '
42b0b25e5fae0ec49362539c124492799226a430':
Add missing copyright header in Open Source code.
Puneet Lall [Fri, 29 Aug 2014 03:35:36 +0000 (03:35 +0000)]
am
53c98a3e: am
82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
* commit '
53c98a3e6b0320614aeb4cbcd4ec1a194b1e3e07':
[ZSL Cam] Fixed shutter button, compress on threadpool.
Spike Sprague [Fri, 29 Aug 2014 03:35:32 +0000 (03:35 +0000)]
am
70e387a7: am
b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
* commit '
70e387a78aa95817280d1c9c74bf866bbbaa1ce6':
fix for a regression introduced in ag/534531
Alan Newberger [Fri, 29 Aug 2014 03:35:26 +0000 (03:35 +0000)]
am
4deea574: am
475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
* commit '
4deea5747493574b6707eff85a350815576ac367':
Increasing JPEG compression quality for filmstrip
Puneet Lall [Fri, 29 Aug 2014 02:10:14 +0000 (02:10 +0000)]
am
68c25ac5: ZSL refactoring
* commit '
68c25ac5373126670cb6c2324e40537bb47e72d9':
ZSL refactoring
Puneet Lall [Fri, 29 Aug 2014 01:36:33 +0000 (18:36 -0700)]
ZSL refactoring
Bug:
16961251
Change-Id: I19642f5de088135db6650df98a62dd8dd462e0da
Puneet Lall [Fri, 29 Aug 2014 01:23:50 +0000 (01:23 +0000)]
am
d308d001: Add missing copyright header in Open Source code.
* commit '
d308d001e876b7036fba2727b18b6b9d652ecffb':
Add missing copyright header in Open Source code.
Puneet Lall [Fri, 29 Aug 2014 01:23:49 +0000 (01:23 +0000)]
am
82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
* commit '
82d70ea06c58df44cfefdc4e1a34644f8f817a23':
[ZSL Cam] Fixed shutter button, compress on threadpool.
Spike Sprague [Fri, 29 Aug 2014 01:23:48 +0000 (01:23 +0000)]
am
b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
* commit '
b8c3e31c32601095488a09c457a5cb154599c6a7':
fix for a regression introduced in ag/534531
Alan Newberger [Fri, 29 Aug 2014 01:23:47 +0000 (01:23 +0000)]
am
475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
* commit '
475a1935894830d3006c29d1155b5d98b62cc006':
Increasing JPEG compression quality for filmstrip
Puneet Lall [Fri, 29 Aug 2014 00:55:18 +0000 (17:55 -0700)]
Add missing copyright header in Open Source code.
Change-Id: I07703e0f55544204645396423ced09f957214d73
Puneet Lall [Fri, 29 Aug 2014 00:46:31 +0000 (00:46 +0000)]
Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
Spike Sprague [Fri, 29 Aug 2014 00:45:14 +0000 (00:45 +0000)]
Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
Spike Sprague [Fri, 29 Aug 2014 00:41:09 +0000 (17:41 -0700)]
fix for a regression introduced in ag/534531
that CL kept the swipe-away-from-filmstip
preview background from alpha-animating correctly.
this CL fixes that and provides an alternate solution
to bug
17301367
Change-Id: I04ba363a55dd9485d13e2d243fd1fb84df1d31e5
Puneet Lall [Thu, 28 Aug 2014 23:44:08 +0000 (16:44 -0700)]
[ZSL Cam] Fixed shutter button, compress on threadpool.
Change-Id: I4c2167163ee35ba841f459ae76779f44647bcb28
Alan Newberger [Thu, 28 Aug 2014 23:41:45 +0000 (23:41 +0000)]
Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
Alan Newberger [Thu, 28 Aug 2014 23:37:33 +0000 (16:37 -0700)]
Increasing JPEG compression quality for filmstrip
This CL increases JPEG quality for generated cache images
in the filmstrip. This reduces overall artifacts for thumbnails.
Bug:
17320690
Change-Id: If2d0483502c0d8d18755b42dff5ffe9fd74e540f
Puneet Lall [Thu, 28 Aug 2014 22:48:43 +0000 (22:48 +0000)]
am
97421aec: am
3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
* commit '
97421aecbefbd073442eff7028fe60f844fcc864':
Zsl flash, auto focus, and other minor fixes
Puneet Lall [Thu, 28 Aug 2014 22:37:25 +0000 (22:37 +0000)]
am
3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
* commit '
3724805a043ac149b7bc103bb94787133c7e06a5':
Zsl flash, auto focus, and other minor fixes
Puneet Lall [Thu, 28 Aug 2014 22:04:53 +0000 (22:04 +0000)]
Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
Puneet Lall [Thu, 28 Aug 2014 02:27:50 +0000 (19:27 -0700)]
Zsl flash, auto focus, and other minor fixes
Bug:
17216526
Bug:
17221258
Change-Id: I5129c57674874d3a29789e0c9029eadeaa138788
Alan Newberger [Thu, 28 Aug 2014 18:15:42 +0000 (18:15 +0000)]
am
1c390f77: am
965db3e8: Merge "Actually remove settings" into ub-camera-glacier
* commit '
1c390f772c03e6eb748407f8c812c7eac8119e03':
Actually remove settings
Alan Newberger [Thu, 28 Aug 2014 18:07:46 +0000 (18:07 +0000)]
am
965db3e8: Merge "Actually remove settings" into ub-camera-glacier
* commit '
965db3e8ca1416e418990344486b1008d1ebc8dd':
Actually remove settings
Alan Newberger [Thu, 28 Aug 2014 17:58:39 +0000 (17:58 +0000)]
Merge "Actually remove settings" into ub-camera-glacier
Alan Newberger [Thu, 28 Aug 2014 17:30:33 +0000 (10:30 -0700)]
Actually remove settings
Correct settings removal, which wasn't occurring during upgrades. Will
followup with scrub of preference file references -- there are likely
additional reasons this wasn't causing more crashes, i.e. certain
settings not being ported over earlier versions.
Bug:
16879376
Change-Id: I720a3181958a4201508726d0f6e06803c456f737
Andy Huibers [Thu, 28 Aug 2014 17:21:12 +0000 (17:21 +0000)]
am
640a8648: am
076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
* commit '
640a86481390c705576a9cd92f988d02dd4b7ab8':
Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
Andy Huibers [Thu, 28 Aug 2014 17:13:09 +0000 (17:13 +0000)]
am
076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
* commit '
076efc0354552ee3b0845ae3b5988e755f92d5b0':
Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
Andy Huibers [Thu, 28 Aug 2014 15:52:41 +0000 (08:52 -0700)]
Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
Bug:
17312087
Change-Id: Ib706e35af5b1f49021efdd45b1e010e24dfbc333
Sascha Haeberling [Thu, 28 Aug 2014 02:24:46 +0000 (02:24 +0000)]
am
10438ec0: am
2d4be257: Add simple sound player to be used in Camera implementations.
* commit '
10438ec0d2e7b1986e473273c7daf09c27861561':
Add simple sound player to be used in Camera implementations.
Sascha Haeberling [Thu, 28 Aug 2014 01:44:02 +0000 (01:44 +0000)]
am
2d4be257: Add simple sound player to be used in Camera implementations.
* commit '
2d4be2576b265a4abfbabbda20862fcea19c1395':
Add simple sound player to be used in Camera implementations.
Sascha Haeberling [Thu, 28 Aug 2014 00:56:08 +0000 (17:56 -0700)]
Add simple sound player to be used in Camera implementations.
Bug:
17205355
Change-Id: I04c4bf1a692c7a4555eafea794737e41a8fc342c
Alan Newberger [Wed, 27 Aug 2014 22:46:58 +0000 (22:46 +0000)]
am
21bd2937: am
352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier
* commit '
21bd2937e08f72b73ed187e7667e2d3f4bd6880c':
Remove FeedbackHelper
Sam Hasinoff [Wed, 27 Aug 2014 22:46:57 +0000 (22:46 +0000)]
am
0cfde67e: am
4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '
0cfde67e18be1ed497987b53953b013b17a23b4c':
gcam: Restore naming of Gcam debug folders.
Alan Newberger [Wed, 27 Aug 2014 22:40:16 +0000 (22:40 +0000)]
am
352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier
* commit '
352de757246fa28c6fdfa5d0d3e51659e23f8183':
Remove FeedbackHelper
Sam Hasinoff [Wed, 27 Aug 2014 22:40:15 +0000 (22:40 +0000)]
am
4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '
4f0d63848684cb7cbcde42b0bd714bb6d6f998f5':
gcam: Restore naming of Gcam debug folders.
Alan Newberger [Wed, 27 Aug 2014 22:34:20 +0000 (22:34 +0000)]
Merge "Remove FeedbackHelper" into ub-camera-glacier
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:31:14 +0000 (22:31 +0000)]
am
30a17805: am
2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier
* commit '
30a17805fbc3226eb02fd074658e2df723d34a22':
Add setprop to enable ZSL.
Alan Newberger [Wed, 27 Aug 2014 22:28:57 +0000 (15:28 -0700)]
Remove FeedbackHelper
ag/393130 has comments pointing out that startFeedback has a leak. We don't
use it anymore after Help library integration, so just remove it.
Bug:
17302992
Change-Id: I519a2b0eb7a0ce06d6fcdcbfa2c851837e9a6579
Puneet Lall [Wed, 27 Aug 2014 22:21:45 +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:48:52 +0000 (21:48 +0000)]
am
ba12c58f: am
969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '
ba12c58f5cbe9a4698441e11c23bee5ae9d48e92':
Make sure CaptureModule (and therefore Gcam) always resumes right.
Sascha Haeberling [Wed, 27 Aug 2014 21:39:51 +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:29:48 +0000 (20:29 +0000)]
am
e77ca66d: am
480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
* commit '
e77ca66d96c692d1d0b4560226a1a25a7c1fcce5':
fix for a doublebounce of the filmstip button on filmstip swipe out
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:25:26 +0000 (19:25 +0000)]
am
ae182077: am
c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier
* commit '
ae182077951354bb2da0e2338a0ee777e2d004e1':
Initial ZSL implementation
Puneet Lall [Wed, 27 Aug 2014 19:18:42 +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:52:10 +0000 (17:52 +0000)]
am
18422419: am
a98b4b10: Merge "boatload of new assets" into ub-camera-glacier
* commit '
184224196f846533c764ce490301bb3cca519a4a':
boatload of new assets
Spike Sprague [Wed, 27 Aug 2014 17:44:37 +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:42:00 +0000 (16:42 +0000)]
am
b95bfd1b: (-s ours) am
0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
b95bfd1b641db6de55aa10e2e5173261f151c567':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:32:57 +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
Sascha Haeberling [Wed, 27 Aug 2014 06:14:51 +0000 (06:14 +0000)]
am
e25590a9: am
95817308: Enable location and heading to be stored in picture EXIF.
* commit '
e25590a998c05297fb151bdf089a292b5d0b59f0':
Enable location and heading to be stored in picture EXIF.
Sascha Haeberling [Wed, 27 Aug 2014 06:04:40 +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
Sascha Haeberling [Wed, 27 Aug 2014 04:49:08 +0000 (04:49 +0000)]
am
a35ba87b: am
779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
* commit '
a35ba87b58db732b528930cd23d72cee33bcc03a':
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
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:59 +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 03:45:42 +0000 (03:45 +0000)]
am
a6e9539a: am
26b224dd: Protect video recording callback from activity/module pauses
* commit '
a6e9539a30454f19b70e7fdf639bd22bc95cec4d':
Protect video recording callback from activity/module pauses
Sascha Haeberling [Wed, 27 Aug 2014 03:45:22 +0000 (03:45 +0000)]
am
b8383940: am
d225ea60: Add volume key capture suppor to CaptureModule
* commit '
b8383940a87ddcadaa051fda93d02f92753cdcdb':
Add volume key capture suppor to CaptureModule
Andy Huibers [Wed, 27 Aug 2014 03:44:49 +0000 (03:44 +0000)]
am
29d5bcd8: am
9d3ec039: Add timeout to touch to focus.
* commit '
29d5bcd89b8d5b61ce0698caa7c211ad11707d3a':
Add timeout to touch to focus.
Alan Newberger [Wed, 27 Aug 2014 02:28:28 +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:41 +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:25:23 +0000 (01:25 +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
Spike Sprague [Wed, 27 Aug 2014 00:40:17 +0000 (00:40 +0000)]
am
1732f551: am
597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
* commit '
1732f551cc31e3f1f9fc47e98e0e3f41be531444':
more consistently apply filmstip hide animations
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:28 +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:12:11 +0000 (00:12 +0000)]
am
67ba1d5b: am
bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit '
67ba1d5b6a5a7091f43c9e5a7883f56c297e9dc2':
Reset metering and focus areas when touch focus period ends.
Andy Huibers [Wed, 27 Aug 2014 00:03:49 +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:25:57 +0000 (23:25 +0000)]
am
dcc2eb04: am
d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit '
dcc2eb045c97a9ecee9b4621af41e1e7b1ceba03':
Remove one shot callback workaround in VideoModule for L
Alan Newberger [Tue, 26 Aug 2014 23:19:37 +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:10:18 +0000 (23:10 +0000)]
am
7a9fecd8: am
462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '
7a9fecd8168ff9a067e4965e42795542472d2323':
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Andy Huibers [Tue, 26 Aug 2014 23:02:01 +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:26:16 +0000 (22:26 +0000)]
am
1424be09: am
91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
* commit '
1424be09e51af9cbf8a8110a0fb3afd009e93fbe':
Material Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 22:16:41 +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:12:12 +0000 (21:12 +0000)]
am
bca02248: am
92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
* commit '
bca0224807455f85d7482aca7e0bcaeb255021ec':
photosphere: Fix TextureView transforms.