OSDN Git Service
Sascha Haeberling [Thu, 28 May 2015 00:59:01 +0000 (00:59 +0000)]
am
9c8512c1: am
3609a80b: am
dad39b12: Add logging for when a session knowingly failed.
* commit '
9c8512c1b5129755efb91a6af36b1b7bec049548':
Add logging for when a session knowingly failed.
Sascha Haeberling [Thu, 28 May 2015 00:37:41 +0000 (00:37 +0000)]
am
3609a80b: am
dad39b12: Add logging for when a session knowingly failed.
* commit '
3609a80b8671b38a282f59795301fd9885b401ff':
Add logging for when a session knowingly failed.
Sascha Haeberling [Thu, 28 May 2015 00:27:21 +0000 (00:27 +0000)]
am
dad39b12: Add logging for when a session knowingly failed.
* commit '
dad39b12816f05468476804b7caf3ef39a4aa682':
Add logging for when a session knowingly failed.
Paul Rohde [Thu, 28 May 2015 00:18:23 +0000 (00:18 +0000)]
am
b0d7a0ef: am
7c4ad98a: am
14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala
* commit '
b0d7a0ef3e172f94e64a089000393fadb3016bd1':
Log capture session canceled events.
Sascha Haeberling [Thu, 28 May 2015 00:04:28 +0000 (17:04 -0700)]
Add logging for when a session knowingly failed.
Bug:
21169512
Change-Id: Ic1dc499785a97f7344e517f555fa5f7b3a1c7ea9
Paul Rohde [Wed, 27 May 2015 23:58:02 +0000 (23:58 +0000)]
am
7c4ad98a: am
14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala
* commit '
7c4ad98a4068e88491bddfe948610e58341d7f4c':
Log capture session canceled events.
Paul Rohde [Wed, 27 May 2015 23:47:34 +0000 (23:47 +0000)]
am
14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala
* commit '
14d92c346e1890cf3eeb0fb9c846d834e2c59179':
Log capture session canceled events.
Paul Rohde [Wed, 27 May 2015 23:36:28 +0000 (23:36 +0000)]
Merge "Log capture session canceled events." into ub-camera-haleakala
Paul Rohde [Wed, 27 May 2015 22:14:59 +0000 (15:14 -0700)]
Log capture session canceled events.
This will handle the edgecase where capture sessions may be
canceled inbetween the time the button is pressed and the capture
actually starts so that it is possible to subtract these cases
out of the unsaved image data.
Bug:
21169512
Change-Id: Ie226d81bb10acd90dc1297230d4b024b7cd2d4d6
Gabriel Nava [Wed, 27 May 2015 21:24:34 +0000 (21:24 +0000)]
am
a5085e67: am
84a379ff: am
d927492a: Handling the GcamService timeout due to application in paused state (camera-Haleakala)
* commit '
a5085e67f2ef90b94534a99d3bf5ec65662ec82d':
Handling the GcamService timeout due to application in paused state (camera-Haleakala)
Gabriel Nava [Wed, 27 May 2015 21:08:02 +0000 (21:08 +0000)]
am
84a379ff: am
d927492a: Handling the GcamService timeout due to application in paused state (camera-Haleakala)
* commit '
84a379fffdc439e49623178e81b9535904de0030':
Handling the GcamService timeout due to application in paused state (camera-Haleakala)
Gabriel Nava [Wed, 27 May 2015 20:50:21 +0000 (20:50 +0000)]
am
d927492a: Handling the GcamService timeout due to application in paused state (camera-Haleakala)
* commit '
d927492ade2e253ccc620effd5602582eaa6dd2d':
Handling the GcamService timeout due to application in paused state (camera-Haleakala)
Gabriel Nava [Wed, 27 May 2015 17:42:03 +0000 (10:42 -0700)]
Handling the GcamService timeout due to application in paused state (camera-Haleakala)
- When GcamService times out due to a pause state, all resources are released.
- Releasing the gcam resources without showing the error dialog allows next resume operation to open the camera
Bug:
21025113
Change-Id: I95a89fbf6ce2498c1323cd4d06383141cc7cb913
Geoff Mendal [Thu, 21 May 2015 18:47:57 +0000 (18:47 +0000)]
am
faaa286e: (-s ours) am
fefb0259: (-s ours) am
7ca4f1a4: (-s ours) Import translations. DO NOT MERGE
* commit '
faaa286e4544fc75b71b4127c698b47c9c2b0e7a':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 18:47:55 +0000 (18:47 +0000)]
am
597f056f: (-s ours) am
b14ca683: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
597f056f04a3d40027cef65edb5a5cfd6138c436':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 18:43:26 +0000 (18:43 +0000)]
am
0611481d: (-s ours) am
f8b9b59a: (-s ours) Import translations. DO NOT MERGE
* commit '
0611481d0542b278f88bd1da9322b39df831308a':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 14:28:44 +0000 (14:28 +0000)]
am
fefb0259: (-s ours) am
7ca4f1a4: (-s ours) Import translations. DO NOT MERGE
* commit '
fefb025973e2bffcbeb02666339fb7797513d82e':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 14:22:06 +0000 (14:22 +0000)]
am
7ca4f1a4: (-s ours) Import translations. DO NOT MERGE
* commit '
7ca4f1a488c01a649bf39fae1848cd31b1dfaa65':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 14:16:11 +0000 (14:16 +0000)]
am
b14ca683: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b14ca683faeb243119363f51206133d8391c921f':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 14:09:50 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:42:33 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f56ffd3cd032a6c6c1984c6a5c0648733a748b2
Auto-generated-cl: translation import
Geoff Mendal [Thu, 21 May 2015 13:41:30 +0000 (06:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d5dba5fc742d7822713e2bfedebb2c240ab01b6
Auto-generated-cl: translation import
Baligh Uddin [Thu, 21 May 2015 13:31:14 +0000 (13:31 +0000)]
am
f8b9b59a: (-s ours) Import translations. DO NOT MERGE
* commit '
f8b9b59adb97d30f3c778587c3069bc90a5c1998':
Import translations. DO NOT MERGE
Spike Sprague [Thu, 21 May 2015 12:22:26 +0000 (12:22 +0000)]
am
0bfc56c3: am
08f4a90f: am
090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug:
21277434
* commit '
0bfc56c3ac1a36261b18ac33afe1acd56c1a80b9':
Fill out more EXIF data, closer parity to Nexus HAL bug:
21277434
Baligh Uddin [Thu, 21 May 2015 04:21:54 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a4df3b736ef4fa7cf5bf772e5e6c86f2254ff21
Auto-generated-cl: translation import
Spike Sprague [Thu, 21 May 2015 01:29:49 +0000 (01:29 +0000)]
am
08f4a90f: am
090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug:
21277434
* commit '
08f4a90f4e4d0416612a138568b2a931c14a9d91':
Fill out more EXIF data, closer parity to Nexus HAL bug:
21277434
Spike Sprague [Thu, 21 May 2015 01:20:59 +0000 (01:20 +0000)]
am
090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug:
21277434
* commit '
090f2fce636d45d8e32d3e8cb665c0880d5a9e70':
Fill out more EXIF data, closer parity to Nexus HAL bug:
21277434
Spike Sprague [Wed, 20 May 2015 02:03:23 +0000 (19:03 -0700)]
Fill out more EXIF data, closer parity to Nexus HAL
bug:
21277434
Change-Id: I4e4d9b4bffa6b0a8ccb3e870d553643dd27d2356
Sascha Haeberling [Wed, 20 May 2015 22:26:46 +0000 (22:26 +0000)]
am
818a4dd9: am
a344634f: am
fa77628e: Merge "Don\'t attempt to update thumbnail if session is finished." into ub-camera-haleakala
* commit '
818a4dd9e76de5b41e146fb460dadc0b77bca595':
Don't attempt to update thumbnail if session is finished.
Gabriel Nava [Wed, 20 May 2015 22:26:45 +0000 (22:26 +0000)]
am
5040b0f4: am
5266ca5c: am
51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
* commit '
5040b0f454bf740dfe9c11854e4596f80d46b224':
Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
Sascha Haeberling [Wed, 20 May 2015 22:14:30 +0000 (22:14 +0000)]
am
a344634f: am
fa77628e: Merge "Don\'t attempt to update thumbnail if session is finished." into ub-camera-haleakala
* commit '
a344634f121d245d2096af445d3f4e5afe94f6f4':
Don't attempt to update thumbnail if session is finished.
Gabriel Nava [Wed, 20 May 2015 22:14:29 +0000 (22:14 +0000)]
am
5266ca5c: am
51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
* commit '
5266ca5cdbb0a024449769317e09a441e13e6ddf':
Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
Sascha Haeberling [Wed, 20 May 2015 22:00:54 +0000 (22:00 +0000)]
am
fa77628e: Merge "Don\'t attempt to update thumbnail if session is finished." into ub-camera-haleakala
* commit '
fa77628ec03fcd74af79da7a85437b0fd14bdae2':
Don't attempt to update thumbnail if session is finished.
Gabriel Nava [Wed, 20 May 2015 22:00:53 +0000 (22:00 +0000)]
am
51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
* commit '
51495cc98578dda7ea2e9eafd5271f2dc0bc2d97':
Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
Sascha Haeberling [Wed, 20 May 2015 21:54:13 +0000 (21:54 +0000)]
Merge "Don't attempt to update thumbnail if session is finished." into ub-camera-haleakala
Sascha Haeberling [Wed, 20 May 2015 21:41:53 +0000 (14:41 -0700)]
Don't attempt to update thumbnail if session is finished.
Bug:
21167342
Change-Id: If2e4db523aa66e82809d30aa35fb9a30d124d9df
Paul Rohde [Wed, 20 May 2015 19:43:49 +0000 (19:43 +0000)]
am
54b9677d: am
a93b4225: am
76ab7148: Merge "Log capture started and bytes on disk" into ub-camera-haleakala
* commit '
54b9677d12c2ebdea0380319bde1969e1c25dd26':
Log capture started and bytes on disk
Gabriel Nava [Wed, 20 May 2015 19:39:02 +0000 (12:39 -0700)]
Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
Bug:
20957536
Change-Id: I6985d009e550f8f67ff36be3fce53c82ada0610e
Paul Rohde [Wed, 20 May 2015 19:35:45 +0000 (19:35 +0000)]
am
a93b4225: am
76ab7148: Merge "Log capture started and bytes on disk" into ub-camera-haleakala
* commit '
a93b4225a5b965dbd00a85864a7b6ce345a1eefe':
Log capture started and bytes on disk
Paul Rohde [Wed, 20 May 2015 19:25:44 +0000 (19:25 +0000)]
am
79b0ede0: am
3e2860f4: am
95a80b6b: Make filmstrip grey squares less common.
* commit '
79b0ede0e6e54c7c6fc8113b71a1bc89f5bf8d11':
Make filmstrip grey squares less common.
Pengchong Jin [Wed, 20 May 2015 19:25:43 +0000 (19:25 +0000)]
am
5d410fb5: am
b1f23f9b: am
10aea802: Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala
* commit '
5d410fb5ff31c08531a0d3bde153d5bf5146b96b':
Workaround of the face detection failure on L and N5
Paul Rohde [Wed, 20 May 2015 19:25:40 +0000 (19:25 +0000)]
am
077cfbd4: am
f5e47427: am
83160a84: Merge "Increase the default JPG buffer size." into ub-camera-haleakala
* commit '
077cfbd4161ac1866a820529bb7d7802ed3a67ef':
Increase the default JPG buffer size.
Alan Newberger [Wed, 20 May 2015 19:25:39 +0000 (19:25 +0000)]
am
5ae3d7a3: am
47e2f28a: am
a5813069: Dynamic configuration management for Camera2
* commit '
5ae3d7a378785363b3d3db4b014becadc9d7cbbb':
Dynamic configuration management for Camera2
Paul Rohde [Wed, 20 May 2015 19:21:07 +0000 (19:21 +0000)]
am
76ab7148: Merge "Log capture started and bytes on disk" into ub-camera-haleakala
* commit '
76ab7148d30b5eab605f3448ac4ff1613f2f019d':
Log capture started and bytes on disk
Paul Rohde [Wed, 20 May 2015 19:19:01 +0000 (19:19 +0000)]
am
3e2860f4: am
95a80b6b: Make filmstrip grey squares less common.
* commit '
3e2860f4a66e3048126ce4d2791c01a69652e17b':
Make filmstrip grey squares less common.
Pengchong Jin [Wed, 20 May 2015 19:19:00 +0000 (19:19 +0000)]
am
b1f23f9b: am
10aea802: Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala
* commit '
b1f23f9b60e28c814828e3a87652ef5580c647f4':
Workaround of the face detection failure on L and N5
Paul Rohde [Wed, 20 May 2015 19:18:59 +0000 (19:18 +0000)]
am
f5e47427: am
83160a84: Merge "Increase the default JPG buffer size." into ub-camera-haleakala
* commit '
f5e47427300ffc5e667765621d801d80f6873d22':
Increase the default JPG buffer size.
Alan Newberger [Wed, 20 May 2015 19:18:58 +0000 (19:18 +0000)]
am
47e2f28a: am
a5813069: Dynamic configuration management for Camera2
* commit '
47e2f28a64e5b52c6fadb459336c182751b72751':
Dynamic configuration management for Camera2
Paul Rohde [Wed, 20 May 2015 19:04:48 +0000 (19:04 +0000)]
am
95a80b6b: Make filmstrip grey squares less common.
* commit '
95a80b6bd97d306cafc74fb96be00ea0eeba1842':
Make filmstrip grey squares less common.
Pengchong Jin [Wed, 20 May 2015 19:04:47 +0000 (19:04 +0000)]
am
10aea802: Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala
* commit '
10aea802d1ab9e2a05e65b347fdb89153bbd2e5a':
Workaround of the face detection failure on L and N5
Paul Rohde [Wed, 20 May 2015 19:04:45 +0000 (19:04 +0000)]
am
83160a84: Merge "Increase the default JPG buffer size." into ub-camera-haleakala
* commit '
83160a849de1488a602f08821ee14353ef67973f':
Increase the default JPG buffer size.
Alan Newberger [Wed, 20 May 2015 19:04:44 +0000 (19:04 +0000)]
am
a5813069: Dynamic configuration management for Camera2
* commit '
a5813069b90628f20dca2184dbb579200a958670':
Dynamic configuration management for Camera2
Paul Rohde [Wed, 20 May 2015 18:43:37 +0000 (18:43 +0000)]
Merge "Log capture started and bytes on disk" into ub-camera-haleakala
Alex Klyubin [Wed, 20 May 2015 16:36:34 +0000 (16:36 +0000)]
am
b3e6d820: am
beb40ca9: Declare that Camera2 does not use cleartext network traffic.
* commit '
b3e6d82065e9bc523267a9936fc37a4bb0027eb0':
Declare that Camera2 does not use cleartext network traffic.
Alex Klyubin [Wed, 20 May 2015 16:22:50 +0000 (16:22 +0000)]
am
beb40ca9: Declare that Camera2 does not use cleartext network traffic.
* commit '
beb40ca95cc4acc2045fb0fe8faa32be2df3ef66':
Declare that Camera2 does not use cleartext network traffic.
Paul Rohde [Fri, 15 May 2015 22:29:26 +0000 (15:29 -0700)]
Log capture started and bytes on disk
Change-Id: I3a62aed33f55b396b4940a7bc9e5da5131616890
Alex Klyubin [Thu, 2 Apr 2015 19:40:54 +0000 (12:40 -0700)]
Declare that Camera2 does not use cleartext network traffic.
This declares to the platform and tools that this app does not use
cleartext network traffic. The platform and tools will be blocking
(on best effort basis) attempts to use such traffic by this app.
For example, attempts to use HTTP (rather than HTTPS) will be blocked.
Bug:
19215516
Change-Id: Icaad30144192b13df87726445e19c37e0fd824bf
(cherry picked from commit
2cd1529cd3ae0aa03e9e28d20b07ac072fc065c0)
Paul Rohde [Mon, 18 May 2015 18:27:40 +0000 (11:27 -0700)]
Make filmstrip grey squares less common.
Increase the encoding priority of the intermediate thumbnails
by changing the task priority to "Average". This causes the
intermediate thumbs to run on their own thread pool, after
the tiny thumbs are generated but allow them to not get
prempted by slow, full jpg encoding tasks.
Bug:
21169512
Change-Id: I2862acac724cf6302c896feeeb04702170cbf030
Alex Cheung [Sat, 16 May 2015 00:26:37 +0000 (00:26 +0000)]
am
ac121930: am
e3ef956f: keep history after reset to ub-camera-haleakala
* commit '
ac121930e73e9b9320592facbc49069b29370c87':
Pengchong Jin [Fri, 15 May 2015 23:12:21 +0000 (23:12 +0000)]
Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala
Paul Rohde [Fri, 15 May 2015 22:55:21 +0000 (22:55 +0000)]
Merge "Increase the default JPG buffer size." into ub-camera-haleakala
Paul Rohde [Fri, 15 May 2015 22:30:13 +0000 (15:30 -0700)]
Increase the default JPG buffer size.
BUG:
21162720
Change-Id: Ie9d634533778c254a000da92f0af2948d814b1dd
Alan Newberger [Fri, 15 May 2015 22:05:00 +0000 (15:05 -0700)]
Dynamic configuration management for Camera2
Ensure Camera2 app selects the appropriate OneCamera per
feature configuration.
Bug:
21204365
Change-Id: I47671a91c89f20e2add2f1f3889d4411341fa1dc
Pengchong Jin [Fri, 15 May 2015 20:07:10 +0000 (13:07 -0700)]
Workaround of the face detection failure on L and N5
This patch is a workaround of the face detection failure on L
and Nexus 5. For Nexus 5 on L, the current FD only works when
the preview stream is configured as the first stream before the
JPEG stream. This change lock the order by creating a capture
session with the preview stream first, and then creating the
normal capture session with preview and JPEG.
Bug: b/
21039466
Change-Id: Icb7f1f758bc9d7ca428c7a4748223072d39dd57f
Alex Cheung [Fri, 15 May 2015 20:10:30 +0000 (20:10 +0000)]
am
4e7793e1: keep history after reset to ub-camera-haleakala
* commit '
4e7793e10a0afef19c7f093920dde36561a12c2b':
Alex Cheung [Fri, 15 May 2015 19:04:43 +0000 (12:04 -0700)]
keep history after reset to ub-camera-haleakala
Alex Cheung [Fri, 15 May 2015 18:51:03 +0000 (18:51 +0000)]
am
e3ef956f: keep history after reset to ub-camera-haleakala
* commit '
e3ef956f23cf797ba59f9eb5c04abb6d5277fb6f':
Alex Cheung [Fri, 15 May 2015 18:17:02 +0000 (11:17 -0700)]
keep history after reset to ub-camera-haleakala
Eino-Ville Talvala [Fri, 15 May 2015 17:38:15 +0000 (17:38 +0000)]
am
1e9a2942: am
82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier
* commit '
1e9a294273b5d22e2fbf3bb52d805783cf700d0b':
Alan Newberger [Fri, 15 May 2015 17:38:05 +0000 (17:38 +0000)]
am
e75df71e: am
29a009c9: Add additional lifecycle logging to Camera
* commit '
e75df71e5b38d314a958279e8fb110dc4fb792c1':
Sascha Haeberling [Fri, 15 May 2015 17:37:55 +0000 (17:37 +0000)]
am
df435d0e: am
dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier
* commit '
df435d0e26b6fa5f0d8443b2d9098d61b54a9f00':
Spike Sprague [Fri, 15 May 2015 17:37:42 +0000 (17:37 +0000)]
am
2615ec28: am
eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
* commit '
2615ec286fe2b14e0c5ab59b08aa8a570dca049f':
Andy Huibers [Fri, 15 May 2015 17:37:32 +0000 (17:37 +0000)]
am
db943ef7: am
17d9084e: Add short flash animation and shutter sound to ZSL camera.
* commit '
db943ef7dc6c6882a77dca49e1628f484ae591ad':
Baligh Uddin [Fri, 15 May 2015 17:37:30 +0000 (17:37 +0000)]
am
45e49681: (-s ours) am
f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
45e496813c438886b1cca69d61ddb48d00eb7c86':
Baligh Uddin [Fri, 15 May 2015 17:37:28 +0000 (17:37 +0000)]
am
e069d11a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
* commit '
e069d11a272e54f0b2fa3bb6dd370199dba0b425':
Import translations. DO NOT MERGE
Puneet Lall [Fri, 15 May 2015 17:37:26 +0000 (17:37 +0000)]
am
73274899: am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
732748991348f84939a769a8daaa2b685a8a70fe':
Puneet Lall [Fri, 15 May 2015 17:37:24 +0000 (17:37 +0000)]
am
0793b929: am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
0793b92914e7770a49fa7993f8b1e3e38b08eb5b':
Alan Newberger [Fri, 15 May 2015 17:37:21 +0000 (17:37 +0000)]
Alan Newberger [Fri, 15 May 2015 17:37:19 +0000 (17:37 +0000)]
am
5c6a72e2: am
2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
* commit '
5c6a72e2d3a954221d00e297ac924d608d2d6b15':
Puneet Lall [Fri, 15 May 2015 17:37:17 +0000 (17:37 +0000)]
am
91eb5f1e: Merge "Force ZSL and CaptureModule to be enabled." into ub-camera-haleakala
* commit '
91eb5f1e9578a91c996dd40ebd91f8988654ae00':
Force ZSL and CaptureModule to be enabled.
Puneet Lall [Fri, 15 May 2015 17:37:15 +0000 (17:37 +0000)]
am
447a570c: am
4d6d676c: Refactor default picture size selection in zsl cam.
* commit '
447a570cca5f53ff243827cd2c60bdc58050b5fa':
Puneet Lall [Fri, 15 May 2015 17:37:13 +0000 (17:37 +0000)]
am
636e7e7a: am
686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier
* commit '
636e7e7a9d842a1871c3ee03b70c6fc1c0a873dc':
Andy Huibers [Fri, 15 May 2015 17:37:11 +0000 (17:37 +0000)]
am
89b48fd0: am
4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
* commit '
89b48fd082cdb2a8e75caa577cbe25a422ee85e0':
Andy Huibers [Fri, 15 May 2015 17:37:09 +0000 (17:37 +0000)]
am
716876f9: am
d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
* commit '
716876f9b254cc020a75e6acec7333c015f90023':
Sascha Haeberling [Fri, 15 May 2015 17:37:07 +0000 (17:37 +0000)]
am
3caff612: am
7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
* commit '
3caff61220ea3f41671c783bdcf8ba893581e596':
Spike Sprague [Fri, 15 May 2015 17:37:04 +0000 (17:37 +0000)]
am
7ba98601: am
b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier
* commit '
7ba98601bc9903b15ec00b66d79b389375a429d4':
Spike Sprague [Fri, 15 May 2015 17:37:02 +0000 (17:37 +0000)]
Andy Huibers [Fri, 15 May 2015 17:37:00 +0000 (17:37 +0000)]
am
64983a28: am
5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
* commit '
64983a28aed593ac09015c6f17c497b3c7a2dac0':
Senpo Hu [Fri, 15 May 2015 17:36:57 +0000 (17:36 +0000)]
am
41777820: am
10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier
* commit '
4177782099827421e4c6486748f29ebfa4805d73':
Alan Newberger [Fri, 15 May 2015 17:36:55 +0000 (17:36 +0000)]
am
12ee27a1: am
ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
* commit '
12ee27a1a2986c31c64c7afb5bde68eca1b3f8d9':
Andy Huibers [Fri, 15 May 2015 17:36:53 +0000 (17:36 +0000)]
am
cd5fcb9b: am
b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
* commit '
cd5fcb9bfee2cf5879135fcbae462bc4c6dfea0e':
Puneet Lall [Fri, 15 May 2015 17:36:50 +0000 (17:36 +0000)]
Puneet Lall [Fri, 15 May 2015 17:36:46 +0000 (17:36 +0000)]
am
9cd04236: am
d308d001: Add missing copyright header in Open Source code.
* commit '
9cd04236ffdc2ef3d03f3bd6a8ac9adf636bbbe0':
Puneet Lall [Fri, 15 May 2015 17:36:42 +0000 (17:36 +0000)]
am
e65cb334: am
82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
* commit '
e65cb334be7f8e4e90a401978879855e25f7d2ce':
Spike Sprague [Fri, 15 May 2015 17:36:38 +0000 (17:36 +0000)]
am
d7ccf67f: am
b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
* commit '
d7ccf67f9f349ce0d40e461713f13629ef2dcb92':
Alan Newberger [Fri, 15 May 2015 17:36:35 +0000 (17:36 +0000)]
am
d7fdc639: am
475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
* commit '
d7fdc639b5ec8530fd7de58e66dcf059c24d1753':
Puneet Lall [Fri, 15 May 2015 17:36:29 +0000 (17:36 +0000)]
am
a7f9c7a4: am
3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
* commit '
a7f9c7a40a45e661a26235c0a8ca6cc74c7a1b0a':
Alan Newberger [Fri, 15 May 2015 17:36:23 +0000 (17:36 +0000)]
am
acf313fc: am
965db3e8: Merge "Actually remove settings" into ub-camera-glacier
* commit '
acf313fc2586c3ff7c19ba9cd8bb514ccb8873e1':
Andy Huibers [Fri, 15 May 2015 17:36:14 +0000 (17:36 +0000)]
am
6366cd8f: am
076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
* commit '
6366cd8f947154688e1814122e5d27fe34ed29aa':
Sascha Haeberling [Fri, 15 May 2015 17:36:05 +0000 (17:36 +0000)]
am
09abe98d: am
2d4be257: Add simple sound player to be used in Camera implementations.
* commit '
09abe98d56a46d016903f0671e94ca6cc966ed54':