| 436aba83744b104d000ae34fead732c5271d3144 |
|
30-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for N4 Video and inclusion of CaptureIntent
Bug: 20694189
Workaround b/19271661 needs to specifically applied in
these circumstances only:
1. Phone is Nexus4
2. CaptureModule is enabled
3. Photo Mode, OR Capture Intent Photo is enabled.
Since we are passing the CameraActivity in TextureViewHelper,
it has enough context to know everything. Previous implementation
used an invalid CameraProvider to signal that Camera2 was enabled.
Now we just ask the CameraActivity directly.
Change-Id: I47f841ae6476bc034a7ad3f487c40616eed05b71
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| f018bce18af5626bf67e6dcb37ea60b0cc6a53cd |
|
30-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for N4 Video Rotation Bug
Previous fix for N4 preview (b/19271661) needed to only be applied
when PhotoModule is active. Grossly plumbed the correct object
references into TextureViewHelper so that it could know which
module was active.
Bug: 20694189
Change-Id: I0f639ae6ee0832f453213699723dc8aa25e5d9e7
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| e2529657eeb168588b9a47f5dc3bc87eb54f503d |
|
27-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure N4 uses the correct texture view transform.
Bug: 19948775
Change-Id: Ib489a5a66cf4a667914c8516f71f54219660fc09
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 1d84d7107686aa428ee2eeb1a8caf0ea3e43b1df |
|
12-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Re-arrange camera initialization.
This change re-arranges several things to make it possible to know
the CameraId you are about to open before you actually open the
camera device. It also adds an explicit CameraId class for handling
both legacy and camera2 id comparisons, an active camera tracker,
and moves the camera id query mechanism into a hardware manager
class in prep for the subsequent camera release.
Bug: 19679820
Change-Id: I4c09b9a12a1ea5badcac3a6a073a56764f9a7eba
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 55e498578b46ef9e7b3aa70f30a68ea9bd788d63 |
|
04-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 16:9 Preview Workaround
The N4-specific fix is to trick the layout UI logic to accept a
16:9 preview coming from a 4:3 surface. When we render the 4:3
surface, we fill in the size of the preview area. So, if
the surface dimensions are 4:3 AND the surface actually
contains 16:9 content AND the preview view is also 16:9, then
preview will actually look correct. To maintain this inconsistency
between the surface and the content aspect ratio, we use the
legacy layout path, and trick the UI layout into laying out
a 16:9 preview, but using a matrix transform that converts 4:3
surface into a 16:9 view. In new and improved matrix transformation
codepath, we correctly assume that the matrix and the preview
size should be consistent.
Currently, the 0.9MP camera setting on the N4 on the front and back
camera produces a squeezed preview, but also produces a squeezed
JPEG artifact and is probably another independent N4 HAL related issue.
But it's WYSIWYG, so I guess it's correct.
Bug: 19271661
Change-Id: I213a423f891a7c216568970c7f520a6134f9ad13
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 1d0dd50db5d3d02d1209b4c0a3e6d4a71d2c8acf |
|
03-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Legacy Autotransform Support to CaptureModule
Added the legacy support for Capture Module to use
the combination of transformations, dynamic layout, and
transform helpers that PhotoModule uses. It seems
to replicate that same functionality as the CaptureModuleUI,
but it's good to have that option for comparison, and to be
able to turn it on and off with one line configuration.
Bug: 19271661
Change-Id: I4ad4fa6fe3547373d6fbf77a53a1a18cd26df8ec
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 8be316c7a8caf962cf3fcf5e49d332fb2718319f |
|
20-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Make it possible for singletons that rely on application context to be
initalized lazily.
* Add AndroidContext
* Add AndroidServices
* Make LogHelper ues thread safe lazy initialization
* Convert several unused fields into local variables in CameraApp.
Change-Id: I9c73e9b91efb49a01d848a8cca1e8e65f059b5d0
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 3830d419691ef865f01b362fee9618bac2aa8888 |
|
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Store ZSL images in correct orientation and show progress in filmstrip.
Added an ImageRotationCalculator which calcuates the image rotation
based on camera characteristics and the device orientation at the time
of the shot.
Also moves the image backend code into its own sub-package.
Change-Id: I4b6b83e3e3cebece83215c19d0aff826ff853352
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 7351415ddfaf7f563a4a12c9204e6feb20fdf49d |
|
11-Sep-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 8c8fb114ad4e121c4c1f3d726632dffbb32bda13 |
|
12-Aug-2014 |
Sol Boucher <solb@google.com> |
Move preview transform matrix code into portability library
This allows it to be calculated differently depending on the backing camera API,
which means that camera2 preview streams can be (and are!) displayed upright.
Bug: 16875535
Change-Id: I58fa86098a8b8eddc8f864b93d1e92672c40a1de
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| ee36c5f591ac181a10692b2ec2b96de5251c4abb |
|
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Minor clean-up around the code base.
Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| b4a2222950f627a39267636fba19649974cb8734 |
|
22-May-2014 |
Spike Sprague <spikuru@google.com> |
intent captrue review gets its own ImageView!
instead of relying on a stopped preview TextureView
bug: 13526027
Change-Id: I40d2a97d15ed5d27b0000fa0a6d96af03ad55cf9
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 313a52110de0a0dabfdadc604637127700f28220 |
|
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Address some code style nits.
Change-Id: I0672216f0d2ccbd7f708a974a573a46e732d4580
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 274f6e962e9e7f94cfc4ceb9cad3fa8dc0a80abb |
|
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Fix jank when switching in and out of hdr+
Also, fix alignment of grid and progress indicator
Bug: 15140487
Bug: 14470553
Change-Id: I09303f16b01a380e617343fa0f3cbe2c12fda147
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 6382c70a769b9ec94a3b0372ee27c0cd075e8be8 |
|
20-May-2014 |
Seth Raphael <magicseth@google.com> |
Add Letterboxing for HDR+
Bug: 14470553
Change-Id: I37d9270b5ad2917c8c19a8aa4abc04967f03621c
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 02c129a598b6a165885fe950275675d62993d2ee |
|
20-May-2014 |
Seth Raphael <magicseth@google.com> |
Preparatory commit for 16:9 hdr+
This exposes some necessary functions for hdr+
to go 16:9. It allows you to pass a preview matrix
that is pre scaled, so that hdr+ can calculate its
own matrix
Bug: 14470553
Change-Id: I56f2c033ff58a9ff6793c6ee4d2317cb9ce5065a
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 344320c90639f823451ddac42e8f39b74727787c |
|
22-Apr-2014 |
Doris Liu <tianliu@google.com> |
Shutter button left handed support
Bug: 12823819
Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 28a2950939614a0c1c83787960ce1a218fb69a5e |
|
11-Apr-2014 |
Doris Liu <tianliu@google.com> |
Refactor preview position logic
Centralize the logic of laying out bottom bar and transforming
preview TextureView based on the total space to lay them out
and preview aspect ratio. The layout is updated when either condition
above has changed. Then the rect of the bottom bar and preview
rect can be queried anywhere. This way, bottom bar, mode options
layout, and any view that relies on the preview rect and bottom bar
rect can be laid out without extra layout passes.
Bug: 13795952
Change-Id: I13c38b566b5b5d8f37ec94f325554c089a86ca8e
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 2bca210e5fc8a77685775ffb403096167b017dce |
|
12-Mar-2014 |
Angus Kong <shkong@google.com> |
Use debug.Log instead of android.util.Log.
see http://ag/438423, merge conflicts solved.
1. Change to use com.android.camera.debug.Log instead of android.util.Log.
2. Add DebugCameraProxy to support more detailed debug info.
3. Add CameraErrorCallback in CameraManager.
4. Support posting to a specific handler for CameraErrorCallback.
5. Trim down some TAGs to match the framework tag length limit.
6. Remove some unused codes in CameraSettings.
bug:13324870
Change-Id: I8c20a8a0d11cfd50b6e199b03cbc88d3c4ad2ceb
Conflicts:
src/com/android/camera/data/LocalMediaData.java
src/com/android/camera/data/RotationTask.java
src/com/android/camera/widget/FilmstripView.java
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 557c77fe3340780da3b016b09e691dc18eb71bb4 |
|
08-Mar-2014 |
Doris Liu <tianliu@google.com> |
Fix HDR+ landscape transform
Some logic in resetting translation overlooked the fact that HDR+ has
rotation baked in the transform matrix because camera2 api requires
that surface texture gets rotated by app for device rotation. As a
result, simply setting the translation to 0 for transform matrix when
there is rotation set on the matrix as well offsets the preview off
the screen.
Bug: 13367662
Change-Id: I0529fe4913b55aebc058c93a901b6689da1208ba
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 90599aa03447f9a836157d429c7a14e74d5b14aa |
|
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
proper preview letterboxing for not-so-tall apsect ratios
bug: 13085409
Change-Id: If574ff5fe290f4b5eb5e2fdb75e9592e5018dce4
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 2bacca795a1b0adb0daf515c43c48234b44bbba5 |
|
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Align the gridlines with the preview area.
1. Rename onPreviewAreaSizeChanged() to onPreviewAreaChanged() since it's
passing in the real preview area and is called when the area is changed
regardless of size changes.
2. GridLines.java now draws the lines based on the preview area.
bug:13098715
Change-Id: Idbd2ba03cad4698689cee46d2aa04588a415fa3d
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 58b9b03f2bedc522bde5b4199121ea2e559c79a9 |
|
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Align preview to bottom bar.
bug:13210080
Change-Id: I6ec4071e2f21ef351b2b16a53662c2a3c1b29721
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 94c9b43061bee072a2322a2001d27e51dae023db |
|
06-Jan-2014 |
Spike Sprague <spikuru@google.com> |
min / max bottom bar height logic
bug: 12668831
Change-Id: Iadccd4c150a37955b0c612539edb6b747f87acbb
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 213a4a086b54904cee543adf60b16fc1a61efe38 |
|
05-Feb-2014 |
Doris Liu <tianliu@google.com> |
New mode drawer.
-Changed the entire look of the mode drawer by using a live preview
as background, and use circle icons rather than block shaped icons
-Fade in the blurred preview frame during mode switch
-Add highlighted and selected states to mode icons
-Center the mode drawer in preview rather than whole screen
-Swapped mode order in the drawer
TODO:
-Add settings access point
-Refine swipe in/out behavior of the drawer
Change-Id: Ibab0fe960bcfbb9635ca7f45d50178cb1ef2941f
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| d8de077f72b04cee1bdf26e5ca1678ac5297bd71 |
|
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Shared texture view in photosphere.
Change-Id: I8dd4898e3800b02fa7f0488104dcfa4600b3845f
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| fe60979d7d7ce78de503404da8e91e118242071a |
|
07-Feb-2014 |
Angus Kong <shkong@google.com> |
Move onPreviewAreaSizeChanged() out of layout pass
Change-Id: I4eb6f6ffda1438fca7575328ce09945d40549d51
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| a1ec04a9f9526418f5cb17a5afbfc48aca1e02d0 |
|
14-Jan-2014 |
Doris Liu <tianliu@google.com> |
Add aggressive continuous auto focus to video preview
Also added touch to focus for video preview
Part II is at ag/407029
Bug: 12368866
Change-Id: I8dd544d5bb6b5128ae99c9b7fe4dffeb1f843ab9
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 15b9961c5ca49fc6ac9d036e7a967797987e46ee |
|
21-Dec-2013 |
Doris Liu <tianliu@google.com> |
Part II of ag/401462
Change-Id: I569179e712d5c4d690a815a16dde31240c396b7f
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 482de029dc20e0a577388a602985fb31c3200309 |
|
19-Dec-2013 |
Doris Liu <tianliu@google.com> |
Touch to focus
Change-Id: I69860bd05426e3a04bc5fd7d0dd581b5d6ff768d
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|
| 70da918464276b110c43868caa272c97baadb89e |
|
18-Dec-2013 |
Doris Liu <tianliu@google.com> |
Centralized TextureView transform logic
Automated transform matrix adjustment and bottom bar adjustment for
orientation or preview size change.
Bug: 12177718
Bug: 12179046
Change-Id: I4cd6fc90bb549774cfd83aaf8ac9654711a5c752
/packages/apps/Camera2/src/com/android/camera/TextureViewHelper.java
|