OSDN Git Service
Alan Newberger [Thu, 11 Sep 2014 18:01:03 +0000 (18:01 +0000)]
am
1bbdb135: am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
1bbdb135f84e0c223bac9ee68e5ef6960e03ae62':
Establish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 17:51:52 +0000 (17:51 +0000)]
am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
45f316bcecb8713cbb217507981fd657fcdaa274':
Establish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 17:25:54 +0000 (10:25 -0700)]
Establish synchronous camera closing when app utilizes API1/API2
To ensure API1 and API2 portability implementations coordinate together,
if app uses API2 for any mode, lock both modes into synchronouse camera
closing.
Bug:
17464089
Change-Id: If4cf1eb02053ec9e56b7b8df97c21e012467aa3a
Baligh Uddin [Thu, 11 Sep 2014 16:06:18 +0000 (16:06 +0000)]
am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
f238265746c8769bdbba8091d6ae0b30f7ee8697':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:02:34 +0000 (16:02 +0000)]
am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
91225f8b7d51be3f2ca8c187de70e775551b3ce4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 15:58:23 +0000 (15:58 +0000)]
am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
0c5fc1d311eaa82dff09cee6332140fda21d473e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 15:49:05 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 11 Sep 2014 15:48:57 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Andy Huibers [Thu, 11 Sep 2014 04:44:11 +0000 (04:44 +0000)]
am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
d3db7916c770c33feffa34dc2da486af66ab8a13':
If we are using CaptureModule for Gcam only, turn off flash.
Andy Huibers [Thu, 11 Sep 2014 04:37:47 +0000 (04:37 +0000)]
am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
e6ebf3d73bb3f337413bdde437fbb8fde6cee436':
If we are using CaptureModule for Gcam only, turn off flash.
Andy Huibers [Thu, 11 Sep 2014 04:08:56 +0000 (21:08 -0700)]
If we are using CaptureModule for Gcam only, turn off flash.
Bug:
17460394
Change-Id: I4743e9c31f516d12537b2ceedc9e1fe35fbd8381
Alan Newberger [Thu, 11 Sep 2014 01:48:20 +0000 (01:48 +0000)]
am
11d3405c: am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
11d3405c96e68888e9d8088f35c77a81e941164c':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Thu, 11 Sep 2014 01:37:45 +0000 (01:37 +0000)]
am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
0c9af933b7227577003f462ddab12a1ca49208fe':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Thu, 11 Sep 2014 01:26:18 +0000 (01:26 +0000)]
Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
Alan Newberger [Thu, 11 Sep 2014 01:26:01 +0000 (01:26 +0000)]
Revert "Delay PhotoModule preview cover removal to address jank"
This CL introduced PhotoModule state corruption, multiple picture taking was not possible. Need to deal with stopPreview during picture taking vs module initialization.
Bug:
17451185
This reverts commit
49fb93b5517e12606eb747f0a5d218b4d03df821.
Change-Id: I0a1eec8147ce859d2e83ee7bdd17655b4054f904
Alan Newberger [Thu, 11 Sep 2014 00:44:18 +0000 (00:44 +0000)]
am
73d569d4: am
7351415d: Reset aspect ratio on pause
* commit '
73d569d4939008528be950f055c571048af6e648':
Reset aspect ratio on pause
Alan Newberger [Thu, 11 Sep 2014 00:33:48 +0000 (00:33 +0000)]
am
7351415d: Reset aspect ratio on pause
* commit '
7351415ddfaf7f563a4a12c9204e6feb20fdf49d':
Reset aspect ratio on pause
Alan Newberger [Wed, 10 Sep 2014 22:03:27 +0000 (15:03 -0700)]
Reset aspect ratio on pause
When resuming the app we do resize things but the old aspect
ratio is cached, thus skipping a reset of the transform matrices
because the app thinks it is already at the correct aspect ratio.
In certain cases (changing orientation when paused) this leads to
layout bugs.
Bug:
17304671
Change-Id: Ia171190b3c76dc05519bdf4d1947d9664d5fb604
Spike Sprague [Wed, 10 Sep 2014 23:24:45 +0000 (23:24 +0000)]
am
ac1dd2f6: am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
ac1dd2f67a60aebbac54b779fa419b4c90e49bf9':
workaround fix
Spike Sprague [Wed, 10 Sep 2014 23:14:50 +0000 (23:14 +0000)]
am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
87a2300ff2b49b8bd6a69815d1e4f3db477fcf4d':
workaround fix
Spike Sprague [Wed, 10 Sep 2014 23:07:48 +0000 (23:07 +0000)]
Merge "workaround fix" into ub-camera-glacier
Alan Newberger [Wed, 10 Sep 2014 23:04:41 +0000 (23:04 +0000)]
am
3d330a60: am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
3d330a601da095e86735d7b58f35d22aa8c4e469':
Delay PhotoModule preview cover removal to address jank
Alan Newberger [Wed, 10 Sep 2014 22:58:30 +0000 (22:58 +0000)]
am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
3096e6729b72a47ee3ed0a68a455bc978036de5c':
Delay PhotoModule preview cover removal to address jank
Alan Newberger [Wed, 10 Sep 2014 22:53:06 +0000 (22:53 +0000)]
Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
Alan Newberger [Wed, 10 Sep 2014 22:44:01 +0000 (15:44 -0700)]
Delay PhotoModule preview cover removal to address jank
Cover should stay in place at least until startPreview completes.
Since it is async, we should call handlers in a callback.
Bug:
17451185
Change-Id: I220c49b9bb75ad977d92780c6eea0ff126a7dcb8
Senpo Hu [Wed, 10 Sep 2014 22:24:58 +0000 (22:24 +0000)]
am
cdf62f78: am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
cdf62f7876cbf24fd8a645a95d1948e65c33c88b':
Return to filmstrip when video playback finishes.
Senpo Hu [Wed, 10 Sep 2014 22:17:02 +0000 (22:17 +0000)]
am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
d3ee86b7c1f1973119619f8e1b356d9707dd0493':
Return to filmstrip when video playback finishes.
Spike Sprague [Wed, 10 Sep 2014 18:31:09 +0000 (11:31 -0700)]
workaround fix
change View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN to View.SYSTEM_UI_FLAG_FULLSCREEN
on L, with View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN the entire camera app window is shifted down by the height of the status bar.
with View.SYSTEM_UI_FLAG_FULLSCREEN thw window lays out correctly.
note: with either flag on KitKat the window lays out correctly.
bug:
17457492
Change-Id: I6534fcedaafbbb525967289db7fb759ba50fca42
Senpo Hu [Wed, 10 Sep 2014 22:11:15 +0000 (22:11 +0000)]
Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
Senpo Hu [Wed, 10 Sep 2014 21:43:16 +0000 (14:43 -0700)]
Return to filmstrip when video playback finishes.
Bug:
17091348
Change-Id: I9703d014029bf29431b099b129b1ed8bce0ffa03
Senpo Hu [Wed, 10 Sep 2014 21:53:39 +0000 (21:53 +0000)]
am
dcf60eea: am
5675b8af: Fix the upside-down orienation bug in CaptureModule.
* commit '
dcf60eeab39218adc901a3ba3a736a0f7ccdc05e':
Fix the upside-down orienation bug in CaptureModule.
Senpo Hu [Wed, 10 Sep 2014 21:43:30 +0000 (21:43 +0000)]
am
5675b8af: Fix the upside-down orienation bug in CaptureModule.
* commit '
5675b8af3fddca8d73d0ce0c8aa2f2a38592f556':
Fix the upside-down orienation bug in CaptureModule.
Alan Newberger [Wed, 10 Sep 2014 21:27:13 +0000 (21:27 +0000)]
am
45090bab: am
d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier
* commit '
45090babe6f614243a179bc7712e75dbf4666fb5':
Remove jank on camera options switching
Jiawen Chen [Wed, 10 Sep 2014 21:22:05 +0000 (21:22 +0000)]
am
d7a4c3e2: am
9cefdd49: Changed double to float. viewFinder -> viewfinder.
* commit '
d7a4c3e265889c010cdf99170c51701019fb64f0':
Changed double to float. viewFinder -> viewfinder.
Alan Newberger [Wed, 10 Sep 2014 21:21:08 +0000 (21:21 +0000)]
am
d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier
* commit '
d79b38d669e9e61a954b02f3aca63810476f6fc5':
Remove jank on camera options switching
Senpo Hu [Wed, 10 Sep 2014 21:15:00 +0000 (14:15 -0700)]
Fix the upside-down orienation bug in CaptureModule.
Bug:
17369697
Change-Id: I5beb0ec45f2dbf372dda88ffd8a92b1632b3ab90
Alan Newberger [Wed, 10 Sep 2014 21:13:54 +0000 (21:13 +0000)]
Merge "Remove jank on camera options switching" into ub-camera-glacier
Jiawen Chen [Wed, 10 Sep 2014 21:10:45 +0000 (21:10 +0000)]
am
9cefdd49: Changed double to float. viewFinder -> viewfinder.
* commit '
9cefdd495332719d987ffb942742ec602793d8d4':
Changed double to float. viewFinder -> viewfinder.
Alan Newberger [Wed, 10 Sep 2014 20:42:57 +0000 (20:42 +0000)]
am
0a156cf6: am
ffc395d6: Reinitialize shutter button in Camera mode upon preview start
* commit '
0a156cf6c8543433e1188da2873241bdb1869c11':
Reinitialize shutter button in Camera mode upon preview start
Jiawen Chen [Tue, 9 Sep 2014 21:14:39 +0000 (14:14 -0700)]
Changed double to float. viewFinder -> viewfinder.
Change-Id: I5f10a5e8dae40f56457b863d5e8c703e7bf68e49
Alan Newberger [Wed, 10 Sep 2014 20:32:05 +0000 (20:32 +0000)]
am
ffc395d6: Reinitialize shutter button in Camera mode upon preview start
* commit '
ffc395d6e7eaafcdcd283e183188de16aa14aa4c':
Reinitialize shutter button in Camera mode upon preview start
Alan Newberger [Wed, 10 Sep 2014 20:07:18 +0000 (13:07 -0700)]
Reinitialize shutter button in Camera mode upon preview start
VideoModule already does this here, and by adding to PhotoModule we
address a bug where pausing when capturing leaves the button
disabled on resume.
Bug:
17426670
Change-Id: I8333b52a72c0da8b58070d689406975332ae632e
Alan Newberger [Wed, 10 Sep 2014 18:45:37 +0000 (18:45 +0000)]
am
2acdb01d: am
5c4bd6b5: Reduce logging for unknown camera scope
* commit '
2acdb01dfb3ce662220f801fb9733cbdca4d6233':
Reduce logging for unknown camera scope
Alan Newberger [Wed, 10 Sep 2014 18:32:48 +0000 (18:32 +0000)]
am
5c4bd6b5: Reduce logging for unknown camera scope
* commit '
5c4bd6b5348a3464783270ea0bb10d4968d3b0cb':
Reduce logging for unknown camera scope
Alan Newberger [Wed, 10 Sep 2014 18:22:19 +0000 (11:22 -0700)]
Reduce logging for unknown camera scope
Still log a warning, but remove stack trace logging.
Change-Id: I28e47feb5d2700fd05e7ff4e6faeb1d5a9e38de5
Andy Huibers [Wed, 10 Sep 2014 17:16:17 +0000 (17:16 +0000)]
am
91c1c555: am
a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
* commit '
91c1c555ec75e66d35ed57dfe6134b50c46ee525':
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Andy Huibers [Wed, 10 Sep 2014 17:08:50 +0000 (17:08 +0000)]
am
a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
* commit '
a710f371b8e454d37b8b2be50e001b79e37c67f2':
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Andy Huibers [Wed, 10 Sep 2014 15:55:10 +0000 (15:55 +0000)]
Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
Qiwen Zhao [Wed, 10 Sep 2014 15:35:46 +0000 (15:35 +0000)]
am
031bcdbd: am
fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
* commit '
031bcdbd1ce646d11542165f626f7590bfa85130':
DO NOT MERGE: Adjust for camera2 API changes
Qiwen Zhao [Wed, 10 Sep 2014 15:29:28 +0000 (15:29 +0000)]
am
fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
* commit '
fd97c6da954f3e3e6f8547f6f7363cddba6c1b9a':
DO NOT MERGE: Adjust for camera2 API changes
Qiwen Zhao [Wed, 10 Sep 2014 15:20:46 +0000 (15:20 +0000)]
Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
Nicolas Prevot [Wed, 10 Sep 2014 09:56:15 +0000 (09:56 +0000)]
am
aefc884c: am
42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
* commit '
aefc884cf5bd12b8caa0a657c33072010cd3234c':
Granting read permission in the result intent for VIDEO_CAPTURE.
Nicolas Prevot [Wed, 10 Sep 2014 09:50:44 +0000 (09:50 +0000)]
am
42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
* commit '
42a5ad5a9c7e660854fd0552b81e025c16db9f05':
Granting read permission in the result intent for VIDEO_CAPTURE.
Nicolas Prevot [Wed, 10 Sep 2014 09:42:35 +0000 (09:42 +0000)]
Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
Andy Huibers [Wed, 10 Sep 2014 07:13:17 +0000 (07:13 +0000)]
Andy Huibers [Wed, 10 Sep 2014 06:57:12 +0000 (06:57 +0000)]
Alan Newberger [Wed, 10 Sep 2014 01:47:37 +0000 (18:47 -0700)]
Remove jank on camera options switching
There are two main causes of jank on encountered on options switching:
1. When requesting camera in requestCamera, a portability refactor
introduced a regression where we blocked in the main thread to close
the camera. This main thread blockage is unacceptable as it caused a
preview freeze in addition to the freeze we were trying to create during
the switch, leading to a two-frame preview freeze.
2. The mode options animations which delay the button state transition,
also resulted in preview stutters. Unsure of cause but reverting first
and will assess fixes and reintroduce.
Bug:
17414652
Change-Id: Ib72e331f1bbb5d3b608d8bdc5656c2ff2836ed42
Andy Huibers [Wed, 10 Sep 2014 01:45:28 +0000 (18:45 -0700)]
Remove toast.
This reverts commit
779414e8bfe23d66de310570ff2314654e45ec9f.
Change-Id: Idf04e0bbb69822792327fd17634a4f95f7eb2092
Senpo Hu [Wed, 10 Sep 2014 00:33:58 +0000 (00:33 +0000)]
am
c4f2f4d9: am
b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier
* commit '
c4f2f4d922530270ba0b586320bb5228e706e04f':
Always match camera orientation with device orientation regardless portrait lock.
Senpo Hu [Wed, 10 Sep 2014 00:29:22 +0000 (00:29 +0000)]
am
7a3bdb23: am
65c00136: Set video quality pref default values at startup.
* commit '
7a3bdb2341c88dd6d1aac86ea8685ff4fa5ccbc9':
Set video quality pref default values at startup.
Senpo Hu [Wed, 10 Sep 2014 00:27:59 +0000 (00:27 +0000)]
am
b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier
* commit '
b954b3e8b9fff8adf82808bd6cac1f9a7ac9505a':
Always match camera orientation with device orientation regardless portrait lock.
Senpo Hu [Wed, 10 Sep 2014 00:22:10 +0000 (00:22 +0000)]
Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier
Senpo Hu [Wed, 10 Sep 2014 00:21:40 +0000 (00:21 +0000)]
am
65c00136: Set video quality pref default values at startup.
* commit '
65c00136cde07e050d05e3da61876199df90dd18':
Set video quality pref default values at startup.
Senpo Hu [Tue, 9 Sep 2014 20:51:25 +0000 (13:51 -0700)]
Set video quality pref default values at startup.
The problem of the old approach is the default values never got set
until switching on video module.
The caveat of the this CL is that the default value tweak is only applied
for Shamu. Rather than basing on device model string, detecting
CamcorderProfile capability is a better way to get this job done. However,
|CamcorderProfile.hasProfile| needs camera id info so I'd argue this CL
is good enough for the Shamu/L release.
Bug:
17060480
Change-Id: Ia53ff6aecad44fe7a32257fa1415163f167c09bf
Senpo Hu [Mon, 8 Sep 2014 08:07:27 +0000 (01:07 -0700)]
Always match camera orientation with device orientation regardless
portrait lock.
Verified that this CL fixes the orientation issue for portrait/landscape
photos taken in PhotoModule with all configuration combinations such as
Camera API1/API2 devices, K/L devices, front/back camera.
Bug:
17360176
Change-Id: If84244726cf7e2ade470c231b8ac16e9b80366fe
Eino-Ville Talvala [Tue, 9 Sep 2014 22:36:54 +0000 (22:36 +0000)]
am
420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev
* commit '
420c2c42f42c1cf9b123a773479d476cede38818':
Adjust for camera2 API changes
Eino-Ville Talvala [Tue, 9 Sep 2014 22:21:07 +0000 (22:21 +0000)]
Merge "Adjust for camera2 API changes" into lmp-dev
Andy Huibers [Tue, 9 Sep 2014 19:52:29 +0000 (12:52 -0700)]
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Bug:
17145703
Change-Id: I18a673a5cac4400a2d6e80a851b1fb12381dc995
Nicolas Prevot [Tue, 9 Sep 2014 19:35:56 +0000 (20:35 +0100)]
Granting read permission in the result intent for VIDEO_CAPTURE.
BUG:
17437266
Change-Id: I84d1a69a3d314a05a7e3b5c949c896700426644e
Eino-Ville Talvala [Mon, 8 Sep 2014 22:13:16 +0000 (15:13 -0700)]
DO NOT MERGE: Adjust for camera2 API changes
Add frameNumber to CaptureCallback#onCaptureStarted
Bug:
17421092
Change-Id: I6e66bd1abc2ecec4dd8346cf4313dc7261ffa26b
Spike Sprague [Tue, 9 Sep 2014 18:31:12 +0000 (18:31 +0000)]
am
b8555b66: am
767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier
* commit '
b8555b66ca0c4571b0a4434321950dc0a6a36505':
back to bigger HDR+ icons
Spike Sprague [Tue, 9 Sep 2014 18:19:51 +0000 (18:19 +0000)]
am
767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier
* commit '
767a1186a1127f070785d50054a0e1a02975eb4a':
back to bigger HDR+ icons
Spike Sprague [Tue, 9 Sep 2014 18:14:13 +0000 (18:14 +0000)]
Merge "back to bigger HDR+ icons" into ub-camera-glacier
Spike Sprague [Tue, 9 Sep 2014 18:02:09 +0000 (11:02 -0700)]
back to bigger HDR+ icons
bug:
17304734
Change-Id: I9b2b22101003b2d13f386367245622d4e13c0309
Baligh Uddin [Tue, 9 Sep 2014 06:35:45 +0000 (23:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I73e4af5066d39bdf6921ef9ac2e6cd1bcb07183c
Auto-generated-cl: translation import
Baligh Uddin [Tue, 9 Sep 2014 06:32:28 +0000 (23:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ffdd38d5234e2c80101f73b329aca5656e167e4
Auto-generated-cl: translation import
Baligh Uddin [Tue, 9 Sep 2014 02:14:07 +0000 (19:14 -0700)]
keep history after reset to lmp-dev
Eino-Ville Talvala [Mon, 8 Sep 2014 22:13:16 +0000 (15:13 -0700)]
Adjust for camera2 API changes
Add frameNumber to CaptureCallback#onCaptureStarted
Bug:
17421092
Change-Id: I6e66bd1abc2ecec4dd8346cf4313dc7261ffa26b
Alan Newberger [Mon, 8 Sep 2014 22:16:40 +0000 (22:16 +0000)]
am
3da669a0: am
f974ba71: Additional logging for CAPTURE intent handling
* commit '
3da669a022b8c43633288eb5f3fd736a2fe82e53':
Additional logging for CAPTURE intent handling
Alan Newberger [Mon, 8 Sep 2014 22:09:08 +0000 (22:09 +0000)]
am
f974ba71: Additional logging for CAPTURE intent handling
* commit '
f974ba719a1255b6bda1b214842641fb5736a877':
Additional logging for CAPTURE intent handling
Alan Newberger [Mon, 8 Sep 2014 21:44:30 +0000 (14:44 -0700)]
Additional logging for CAPTURE intent handling
Adds verbose logging and some exception log warnings to help diagnose issues
in CAPTURE intents.
Bug:
17421140
Change-Id: Ib0afe4219418b1e7ee5ca4879e39a4448ec13cc0
Andy Huibers [Mon, 8 Sep 2014 21:06:35 +0000 (21:06 +0000)]
am
28785c93: am
6281a794: Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier
* commit '
28785c932cf6c4cf42142fb2f31cd1d1f7ca5c47':
In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
Andy Huibers [Mon, 8 Sep 2014 20:59:59 +0000 (20:59 +0000)]
am
6281a794: Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier
* commit '
6281a7942de9e55386c20c6f41bfb656b126a364':
In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
Andy Huibers [Mon, 8 Sep 2014 20:53:28 +0000 (20:53 +0000)]
Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier
Alan Newberger [Mon, 8 Sep 2014 20:20:42 +0000 (20:20 +0000)]
am
96892115: Merge "DO NOT MERGE Pipe context through to camera" into lmp-dev
* commit '
96892115f49712fde5fe16d352d24691632d74a4':
DO NOT MERGE Pipe context through to camera
Alan Newberger [Mon, 8 Sep 2014 20:11:04 +0000 (20:11 +0000)]
Merge "DO NOT MERGE Pipe context through to camera" into lmp-dev
Andy Huibers [Sun, 7 Sep 2014 03:44:25 +0000 (20:44 -0700)]
In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
Bug:
17397777
Bug:
17028594
Bug:
17391241
Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f
Alan Newberger [Mon, 8 Sep 2014 19:10:28 +0000 (19:10 +0000)]
am
03812d8c: am
76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs
* commit '
03812d8c8cb03d56b5dda9d17b8066e4b39906d0':
DO NOT MERGE Update Camera2 to use latest APIs
Alan Newberger [Mon, 8 Sep 2014 19:03:56 +0000 (19:03 +0000)]
am
76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs
* commit '
76215c98a9a11d87b5ce9d2b4198654c2b8bbddf':
DO NOT MERGE Update Camera2 to use latest APIs
Sascha Häberling [Sat, 6 Sep 2014 02:50:42 +0000 (02:50 +0000)]
DO NOT MERGE Pipe context through to camera
Bug:
17203825
Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468
Will also apply this one to haleakala.
Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a
(cherry picked from commit
13d07d0ecb3bc808fb6f5b65508b1948ab3149d8)
Alan Newberger [Mon, 8 Sep 2014 18:26:27 +0000 (11:26 -0700)]
DO NOT MERGE Update Camera2 to use latest APIs
Bug:
17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e
Spike Sprague [Mon, 8 Sep 2014 18:22:38 +0000 (18:22 +0000)]
am
994d9136: am
954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
* commit '
994d9136e0085e2fbb30f260ec140c8d2c6295df':
wait for filmstrip bottom panel buttons to finish animating to show clings
Spike Sprague [Mon, 8 Sep 2014 17:41:47 +0000 (17:41 +0000)]
am
954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
* commit '
954b9b1ce7cd3e7b4a4c0fa35f8ca873fba5ac14':
wait for filmstrip bottom panel buttons to finish animating to show clings
Spike Sprague [Mon, 8 Sep 2014 17:31:33 +0000 (17:31 +0000)]
Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
Sascha Häberling [Sat, 6 Sep 2014 03:07:59 +0000 (03:07 +0000)]
am
dc563a37: am
13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera
* commit '
dc563a3713e1cd6c4cc2c1681cac081b753e161b':
DO NOT MERGE Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 03:07:58 +0000 (03:07 +0000)]
am
4a9de272: am
bcc384ea: Revert "Pipe context through to camera"
* commit '
4a9de272c251432c100986f8167618d101e5a522':
Revert "Pipe context through to camera"
Sascha Haeberling [Sat, 6 Sep 2014 02:58:44 +0000 (02:58 +0000)]
am
8b239e7d: am
f6bf65e9: Pipe context through to camera
* commit '
8b239e7d9021d9c674f68e688c131fb95fa4daa7':
Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 02:58:11 +0000 (02:58 +0000)]
am
13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera
* commit '
13d07d0ecb3bc808fb6f5b65508b1948ab3149d8':
DO NOT MERGE Pipe context through to camera
Sascha Häberling [Sat, 6 Sep 2014 02:58:10 +0000 (02:58 +0000)]
am
bcc384ea: Revert "Pipe context through to camera"
* commit '
bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52':
Revert "Pipe context through to camera"
Sascha Häberling [Sat, 6 Sep 2014 02:50:42 +0000 (02:50 +0000)]
DO NOT MERGE Pipe context through to camera
Bug:
17203825
Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468
Will also apply this one to haleakala.
Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a
OSDN Git Service
