| 14de25b5c502ffb2ac6396014624206562affef2 |
|
07-May-2015 |
Gabriel Nava <gnava@google.com> |
Opening the right camera on app restart when using PhotoModule (camera-haleakala)
- In existing logic PhotoModule reverts to back camera if no aspect ratio has been selected
- Reverting to Back camera only if device allows showing the aspect ratio dialog (N4,N5,N6)
- Updating the Camera ID persistent setting if reverting, not only the runtime value
Bug: 20889927
Change-Id: Ie59b878fd03da751c552fbf92ec5c96889144016
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ca434e5414ae721e577da44c279a7fad9f43ca2a |
|
04-May-2015 |
Gabriel Nava <gnava@google.com> |
Preventing camera button to get into wrong state when pressed in succession (camera-haleakala)
- Adding methods to ButtonManager to enable/disable camera button explicitly
- Camera button cannot be enabled during initialization if it was explicitly disabled
- PhotoModule, VideoModule and CaptureModule enable/disable camera button on camera switch
- Capture button is disabled before requesting the camera switch
- Capture button is re-enabled once the camera open confirmation is received
Bug: 20693214
Change-Id: I6383c705eee0a82397b975332cf37bbcd5913128
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ce9ef4e3528e5599773809f74657b798c370aad2 |
|
01-May-2015 |
Gabriel Nava <gnava@google.com> |
Disabling non available options instead of hiding when hw support is present (camera-haleakala)
- Global scope property persists the support of flash and hdr for the main camera (back)
- If option is not supported at all, option is hidden
- If option is supported in at least one camera but not supported in current module, option is disabled
- If option is supported in current module, option is enabled
- Avoiding race condition where CameraAppUI.applyModuleSpecs was bein called multiple times simultaneously for the same change
- Adding a check so BottomBar UI is updated only when there's a scope (module/camera) change, unless...
- Scope check can be requested within same scope for settings change
Bug: 20630060
Change-Id: Iac5fa2658f04fe8329a2232fb0d5b11d20e566a2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6bb2326e658562bbffb8ca5b8d33e84062e519d9 |
|
24-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Add Faces and Lens Dist. info to photoCaptureDone" into ub-camera-haleakala
|
| ad529c3073ce16c1cc2861f33658132b87bfea95 |
|
18-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Add Faces and Lens Dist. info to photoCaptureDone
Added the plumbing for getting values off of the
TotalCaptureResult and putting them into the
photoCaptureDoneEvent.
Bug: 19805467
Change-Id: Id0d16623ffe7eef78b23fd15a4edfeeca5a66eaa
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 46aac2cd824dceb30afebf1c8da955e4fa55ac5c |
|
20-Mar-2015 |
Senpo Hu <senpo@google.com> |
Clean up HDR+ button state logic.
CameraAppUI#applyModuleSpecs should honor whatever HardwareSpec and
BottomBarUISpec provided by modules. UI should not change behavior by
poking setting by itself. This can cause huge pain when debugging.
Bug: 19657871
Change-Id: Ief153f6c92a12ab1a72732a7a0908059fd91167e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.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/PhotoModule.java
|
| d2672f692de547859664be4e7f6950f8f9b0bc89 |
|
17-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Add processing time to capture done event for CaptureModule captures.
Bug: 18913439
Bug: 19035503
Change-Id: Ib3768d93a2240ccfbf5f5a750b66939c6930ed0e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 698e271d2b263778bfa73d1e67d6e2cd2783c89e |
|
04-Mar-2015 |
zafir <zafir@google.com> |
Added more error handling for camera access and picture storage issues.
Implemented onFailure() method in the OpenCallback interface and
onPictureTakingFailed() in the PictureCallback interface.
OnFailure() routes through showErrorAndFinish() in the AppController.
Bug: 19452391
Change-Id: I3c19a274cc7664f7d1834899a486c57d0585dc9a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 4c364aa8a0c0a536548c0186462289173fe23334 |
|
04-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
PhotoModule Timing Regression Fix onResume
Fix for an timing issue on initializing the Accessibility UI
without having a valid CameraCapabilities. The initialization
of the Accessibility UI is moved to onCameraAvailable.
Bug: 19605317
Change-Id: Ifbbaca71141a187750890ffe66a1a62558f80f64
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| e61fbc4cba45ec740703d9a9e2a651e2d3e3a3c2 |
|
03-Mar-2015 |
zafir <zafir@google.com> |
Merge "Adding ability to zoom in accessibility mode using TalkBack" into ub-camera-haleakala
|
| 971ad50c0f220a396ffce50245617ff59ed0a09e |
|
21-Feb-2015 |
zafir <zafir@google.com> |
Adding ability to zoom in accessibility mode using TalkBack
Bug: 18986078
Bug: 19546523
Change-Id: Ie68234a9a3a0b8b9be870cc674658194c72c84ef
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 734122e8fe6c621a8510043839f05a0adff4c3a4 |
|
06-Feb-2015 |
zafir <zafir@google.com> |
Adding reporting functionality using Feedback API for PhotoModule and CaptureModule when captured pictures don't save to the device.
Bug: 19231841
Change-Id: I7d66db1e4c273dc7ec082f40a80b349bd91a7e8b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f2399a5148ec6f101e9e0b3f137d33b443b79b8c |
|
24-Feb-2015 |
Alan Newberger <alann@google.com> |
Make module scope prefix a static agent value
This removes the multiple "PhotoModule" strings across
the codebase and allows for retrieval of a module's string
scope prefix as part of its static ModuleAgent properties
rather than as a property of the module itself.
Bug: 19482146
Change-Id: I2c36878dd070106149909f19f98bcae221b94012
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8f51086c8177056345de996963515c4bd3415254 |
|
19-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Centralize logic for Camera API feature determination.
Bug: 19179276
This captures camera capabilities in a centralized class and allows
them to be overridden by GServices in the field or using adb.
Since this is not it's own class it would be trivial to create another
instance for testing and pass that into CameraActivity or even to change
these values using a UI before the actual Activity is started.
Change-Id: I74262c8467f631c7b5e42b02d269d5f401d4e9e7
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6ba8eeea4758e29318c615e978c63599c30438b4 |
|
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Add a PreviewSizeSelector interface.
This removes the required context object for the utility objects
in both CameraUtil and CaptureModuleUtil. Adding an interface
for PreviewSizeSelection clears the way for future work to move
the preview size selection code into a dedicated class and to have
api specific versions of preview selection code for startup
speed improvements.
Change-Id: I92e58dad23b08057eb10984c31d04947a376ac6d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6dd5840e86bffecba8a7f52327b9c1085caeb7d2 |
|
10-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Route all thumbnail updates through CaptureSession
Bug: 19326495
Bug: 19310525
This removes the thumbnail ready callback that was hooked directly into
the ImageBackend from the CaptureModule before since it's now
unnecessary.
Client of CaptureSession can no optionally specify whether the updated
thumbnail is to be used to update the capture indicator. Default is
'yes' so that Lens Blur, Photo Sphere and HDR+ don't need to change.
Change-Id: I94adb50f875ccee214492f03f00ed2a67d400da1
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b62fa4716df6bcc526f575006822e06dd8ea9b83 |
|
03-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Move CaptureSession into it's own file and clean up interface.
Change-Id: Iaca24e22b541aec898cdf1d3246c98ed72cd85ca
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a19ffced0ec4d1392b5abd31a47001b279d25f8b |
|
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
set default flashMode and focusMode onto Camera Settings
add null checks when accessing flashMode and focusMode
bug: 18200939
Change-Id: I622deed48764ff42b5db9a7313c5bdf3253d3f69
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 5c1db74d807c64e7917d927b532cd109c697ce35 |
|
20-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Make most app services lazy.
Change-Id: I476914b1ed399f8ad727ac33782229cdf39d378f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.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/PhotoModule.java
|
| d7aab1856f58f13905b7e2705108795f6c2567a4 |
|
16-Jan-2015 |
Andy Huibers <andyhuibers@google.com> |
Move stats to new package.
Change-Id: Idfab1a24c91ff4c96515f3520283c7a0512d0514
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| fb0496133a0b4b526dc70f6447bd4b97d95de95f |
|
12-Jan-2015 |
Senpo Hu <senpo@google.com> |
Move FirstRunDialog to app layer.
The first run logic should live in CameraActivity. This refactoring
could clean up CaptureModule and PhotoModule.
* Introduce ResolutionSetting class.
* Introduce OneCameraManagerImpl for camera API 1.
Tested and verified this works on K / L devices.
Change-Id: I11a968a9346b520dee23fc4591a73bb483c43246
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8b2a3ef10a7eea3e703397a3d94766029b0c5581 |
|
10-Jan-2015 |
Senpo Hu <senpo@google.com> |
Add HeadingSensor.
A small step to clean up PhotoModule and CaptureModule...
Bug: 17985028
Change-Id: Ic79dd5e2582479d8ed9705e8150c4438e39116c8
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2272f8a6bfc8adca8ada7a215bef038d45256085 |
|
16-Dec-2014 |
Senpo Hu <senpo@google.com> |
CaptureModule first run dialog.
* Introduce FirstRunDialog.
* Add OneCameraCharacteristics so we can query camera properties without
opening the camera.
* Refactor AspectRatioDialogLayout and LocationDialogLayout to clean up.
* Refactor to move away from portability/Size class in Camera2.
Bug: 18623223
Change-Id: I05f4eefe3ee2feeaa47b6296f8926f6be8e83051
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 01d56038a53487a9b7989bd17c732b8919da64f1 |
|
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Delete unused code.
Change-Id: I55e6da712199cb106781bea8a51cf98fd5ed7e31
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 987ee64612e2510004fdf08536746c87234d01c1 |
|
05-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Drop new focus indicator into Camera2.
* Create a new custom focus view that interacts with physical lens diopter changes.
* Replace all occurances of the old focus indicator with the new one.
Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 3d653d3254d9f4411f0b7a4dd56fd739bacd255d |
|
10-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "New capture indicator design for Haleakala." into ub-camera-haleakala
|
| 427a915be4bcc84fa1c32d9e9e1b7473c522f732 |
|
20-Nov-2014 |
Senpo Hu <senpo@google.com> |
New capture indicator design for Haleakala.
* Introduce RoundedThumbnailView and retire PeekView.
* Rename BottomBarModeOptionsWrapper to StickyBottomCaptureLayout.
* Verified on K and L devices.
Thumbnail cropping:
* 100% width and vertically centered for portrait.
* 100% height and horizontally centered for landscape.
General behavior spec:
* Hide the capture indicatorby fading out using fast_out_linear_in (150ms):
1) User open filmstrip.
2) User switch module.
3) User switch front/back camera.
4) User close app.
Behavior spec for non-photo modules:
* Photosphere is stripped of UI so there is no need to show capture
indicator. When a photo sphere is taken (and user is in another mode),
the preview frame used in filmstrip is used in the capture indicator.
* Video: show in viewfinder prior or after capture. Hide during capture.
When a video is taken, the preview frame used in filmstrip is used in
the capture indicator.
* Panorama: Show in viewfinder prior or after capture. Hide during
capture. When a panorama is taken, the preview frame used in filmstrip
is used in the capture indicator.
* Lens blue: Show in viewfinder prior or after capture. Hide during
capture. When a lens blur is taken, the preview frame used in filmstrip
is used in the capture indicator.
Visual spec:
A 12dp spacing between mode option overlay and thumbnail.
1. A circular mask that excludes the corners of the preview image.
2. A solid white layer that sits on top of the preview and is also masked
by (1).
3. The preview image.
4. A 'ripple' which is just a white circular stroke.
Animation spec:
(1) only the scale animates, from 50%(24dp) to 114%(54dp) in 200ms then
falls back to 100%(48dp) in 200ms. Both steps use the same easing:
fast_out_slow_in.
(2) opacity, from 50% to 0% over 150ms, easing is exponential.
(3) doesn't animate.
(4) starts animating after 100ms, when (1) is at its peak radius and all
animations take 200ms, using linear_out_slow in. Opacity goes from 40%
to 0%, radius goes from 40dp to 70dp, stroke width goes from 5dp to 1dp.
Bug: 18317565
Change-Id: Ib8d4f065b98fc3b9b0b627633232ce8cee96eb61
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 529d5f670e363fdfd76b05634faf1169a821a3ec |
|
04-Dec-2014 |
Alan Newberger <alann@google.com> |
When checking for scene mode, use NO_SCENE_MODE in addition to AUTO
Some devices don't have any scene modes, in that case don't try to
override parameters like flash, a code path that should only be
used for actual scene modes active.
Bug: 18600226
Change-Id: If094d8be6bb4f9d8bc66d033374e17898ed98bee
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| e29804fdace7b653932314407a5bdcf58569e590 |
|
25-Nov-2014 |
Alan Newberger <alann@google.com> |
Separate enable/disable and show/hide logic in ButtonManager
Show/hide occurs during module init, and should not be overridden
during operation when buttons are enabled/disabled. Rather than
make all enabling code handle the complexity of button visibility,
this change just configures buttons to be visible once. Addresses
bug where flash button becomes visible on devices without flash
when toggling HDR, due to logic that enables/disables flash and
HDR together.
Bug: 18376973
Change-Id: I787858ccde1fed9833fd24ac51d3b0bd3cc90df7
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0bdc4b54a18c18d7094b2e4cea1e238005c5c4a2 |
|
18-Nov-2014 |
Senpo Hu <senpo@google.com> |
Unify orientation calculation logic.
Camera API takes clockwise degrees for JPEG rotation and
OrientationEventListener reports clockwise device orientation.
The easiest formula of calculating output image rotation degree is:
"camera sensor orientation" + "device orientation"
Since front cameras face in opposite direction. The result needs to be mirrored
for front camera.
Detailed changes:
* Refactor OrientationManager to remove unnecessary complexity.
* Add OrientationManager.DeviceOrientation enum and
OrientationManager.getDeviceOrientation
* Remove CameraUtil.roundOrientation.
* Fix the weird calculation which is hard to understand in
CameraUtil.getJpegRotation and add CameraUtil.getImageRotation
* Clean up image rotation logic in all modules:
* Always look up the current device orientation via OrientationManager.getDeviceOrientation
* Fix the doc for copyImagePlaneToBitmap() which actually rotates image
counterclockwise.
* Clean up CameraActivity:
* Remove CameraActivity.onOrientationChanged and
ModuleController.onOrientationChanged. Any individual module which
wants to listen orientation change should register itself to
OrientationManager. Now only VideoModule needs to do that.
Bug: 17443789
Change-Id: I6d54cac5bde950acae0c3226448c27a816266df0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 5a64d117ceccc8572a426e7d27306d81aa5c5663 |
|
04-Nov-2014 |
Alan Newberger <alann@google.com> |
move size parameter setting before other settings
Update picture size before applying parameters prior to starting preview.
This is required to avoid a 640x480 default picture stream on the Nexus 4
which is causing lowered preview frame rates (for unknown reasons).
Bug: 18227551
Change-Id: I2b7648146ff57d5a7d78a22f884643c6d62497e6
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 47e9f17a13b391554c8121aae049e91b553688cf |
|
23-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Clean up orientation logging" into ub-camera-glacier
|
| e9f7b2dd640eb893e682413ddbebc4cd88582300 |
|
23-Oct-2014 |
Alan Newberger <alann@google.com> |
Clean up orientation logging
Making it a bit easier to compare rotation vs capture metrics.
Bug: 18055323
Change-Id: I15904a00fcb463739b5d7e4c2ca7627be2ecb2b7
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 375f9d11af33688eb0074e3828c870076cfa21b3 |
|
18-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Stop activity leaks
Bug: 12805279
This CL fixes all known activity leaks that occur from our
app. One leak remains that is caused by Camera Framework and
is tracked under b/18077200.
For details on how to find and chase these leaks down, see
http://go/camera-activity-leaks
Change-Id: I9608e2fcf77fe97528b883ed40e0c08bbbf45bdf
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 05edd2eec40d2a3ce7a76dc9f4d7dfe65e576ab7 |
|
21-Oct-2014 |
Alan Newberger <alann@google.com> |
Increase VERBOSE logging for PhotoModule orientation use
Log all orientation values to diagnose capture orientation behavior.
Bug: 18055323
Change-Id: If63455104f7b96f5797f2651d1aadcadee67e1af
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 7dabda684367122fa2dc2097e198ac6241279bcd |
|
16-Oct-2014 |
Alan Newberger <alann@google.com> |
Show capturing UI before review UI in intent countdown timer
Going prematurely to the review UI means you can hit the checkbox
before we have JPEG data. With this change, after countdown you
see a grayed out capture button like normal capture animation,
then the checkbox review UI when the picture is ready.
Bug: 18002016
Change-Id: Ieddd71636f962c127aa470ec0f150987d3d287ab
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c6a488761b2b9deb11bdcac051dfeacd212ee90f |
|
14-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier
|
| 9746ebec86df2f276ee18eeaf070ff0fc4ad06ec |
|
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Prevent NullPointerException of PhotoModule in quick resume-pause.
Bug: 17984743
Change-Id: Ie597dbddb383004deace8933f51f091029c0a9b4
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8d1ac99f4c6f43fc093f787128f729ba12aa9332 |
|
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
disable shutter button as soon as possible
to avoid double shutter presses
bug: 17939465
Change-Id: Iac19b8fa78774b525fbaf0d4742d97764d401b78
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 4d4585da32d9b5a47bffad1deeb08fc5cd128311 |
|
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier
|
| ac9070ee24d2db6e7804cdd26df578e7ab76895e |
|
11-Oct-2014 |
Senpo Hu <senpo@google.com> |
Migrate old CameraErrorCallback class to agent's CameraExceptionHandler.
Per ag/565603, clean up the old CameraErrorCallback.
Bug: 17931297
Change-Id: Id750581850680ed6cf85738daf5ebdebf67f4800
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ce90f7b459272f16be1983012ec118f4069a3766 |
|
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Pass NamedEntity to saveFinalPhoto since it can be nulled in pause().
Bug: 15289634
Change-Id: I551f73f5f0ceecf2d8a1e3b379dd34fd06b044d8
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 877c2b65415ad43eb424f8a4a27bbeee7771d5bf |
|
04-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
Bug: 17740679
Change-Id: Ia15749971f45f6579a19c379ee95c83c9ce20ccc
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 19597371a18921bb03337e4fa24c28dd2d8f06ed |
|
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Only set preview size before starting preview
Remove recursive call to startPreview when updating preview size.
Avoid invoking preview size parameter updates for all calls to
updateCameraParametersPreference, and only adjust preview size
immediately before starting preview. Also added info logging
for all call paths into startPreview() to better diagnose
sequence of events in logs if we still see any races or
ordering issues.
Bug: 17809876
Change-Id: I626c913bb154c54aaffb451c24a63c6750553a52
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 4de9b72f79fe256766f25497bff44cb5533b7508 |
|
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Use singleTask to improve unsecure lockscreen startup
This enables warm-starts from the lockscreen by reusing the same
activity if possible.
Bug: 16035858
Change-Id: I4b1ce0c290e209a5098e3f3e71509e0ca86e1845
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| feb07ea4e32c7dcc4488515220a4a1881b5e6585 |
|
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier
|
| 4ba2829246afa91db18d4ed41d08eddac8d91bc0 |
|
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: add null check for all CameraProxy obj references in
VideoModule.
Bug: 17657161
Bug: 17653725
Change-Id: Icca2b9dffdfe954e979d9af7e47d78b539dc2b9d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ad12363ecaba370c2425677eef6e562bf7c98e3e |
|
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Revert app workaround for bug 17614203 now that HAL is fixed.
This reverts ag/543302.
Bug: 17614203
Bug: 17145703
Change-Id: I3ec21902e59156ea30c181ecd6a7728f7262110a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ee3123ba4b4cc107423441bb8d687c14a2dc4b9a |
|
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: add null check for all CameraProxy obj references in PhotoModule.
Bug: 17643705
Bug: 17604028
Change-Id: I6073f32bae286168c040f5667494ede1384ce3fc
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 347dccbe1ed10ceec190af4d3797a197426f1caf |
|
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Ensure Camera doesn't attempt access of back camera on Nakasi
Bug: 17647004
Change-Id: I823f98cfdfcc7429b6acf98215e4a08787bc1bb9
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2631a15a37b890f4ee720c5a4bbe3e654524deb6 |
|
24-Sep-2014 |
Alan Newberger <alann@google.com> |
Don't show aspect ratio UI if using API2 portability
Avoid preview size changes due to current state of locking in API2
portability implementation.
Bug: 17462976
Change-Id: I9426380699988d67b21ce86850ef00736e84a5d6
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| eeeed4fa00ed842050bc7e0edd3b37c262802a5b |
|
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
new sounds for timer ticker and pano / photosphere intermediate captures
companions CL: ag/534823
bug: 17281234
Change-Id: I9d98d8e869dcefdbd0f7e0b53dea6b8e024a8e3b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 5cc48d6032b9412d5825c82ab70f145c3c3056a4 |
|
22-Sep-2014 |
Spike Sprague <spikuru@google.com> |
monkey test NPE fix, another null check on mCameraDevice
bug: 17604028
Change-Id: I7b45c101045b765562146ebe2c779e227a6227bd
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8bbb51221106c12b0cf7e933fc2af2a63b84b1c1 |
|
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
|
| ae56c121dcf772e1c7bc77c5e9009b1bc5ee4e44 |
|
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
add null check to updateCameraParametersPreferences to apease the monkey
bug: 17580046
Change-Id: I4a109c1134684f6d5b2dafdb138137ef36f208f0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 963775c3092e2553ae8157df9e5d307d4f711de1 |
|
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
portability layer doesn't work well with startPreviewWithCallback()
here's a dirty dirty workaround.
bug: 17576554
Change-Id: Ief40b65ce49712153f6ef604a3513348e493d4d9
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 3c3b31dfd5ec7a43e89cd4695cc8c498afc3a91d |
|
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
mode switch jank fixes
puts many ValueAnimators news into initialize methods
changes startPreview() calls to startPreviewWithCallback()
puts MultToggleImageButton's bitmap combine into an AsyncTask
bug: 17070332
Change-Id: Idea6396264588b345ed27b9f96f9434ff3e7e77c
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 70a96525f16ca6c6abb9a7a9dab26ba1e61235dd |
|
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Don't send redundant requests to start the preview
Change-Id: I43d8a2917bbe0140f1e9367cce21f68b19807aa8
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0c9af933b7227577003f462ddab12a1ca49208fe |
|
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
|
| 843e0e18458e9249b2d7364aa09e739eec7e50b3 |
|
11-Sep-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/PhotoModule.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/PhotoModule.java
|
| 49fb93b5517e12606eb747f0a5d218b4d03df821 |
|
11-Sep-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ffc395d6e7eaafcdcd283e183188de16aa14aa4c |
|
10-Sep-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a710f371b8e454d37b8b2be50e001b79e37c67f2 |
|
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
|
| bb1c72f7b9b8659071bc74e7949f8a360be0578d |
|
08-Sep-2014 |
Senpo Hu <senpo@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0f54d2840314efdccb98fcc48bb1e32d6a774a33 |
|
09-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Bug: 17145703
Change-Id: I18a673a5cac4400a2d6e80a851b1fb12381dc995
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f974ba719a1255b6bda1b214842641fb5736a877 |
|
08-Sep-2014 |
Alan Newberger <alann@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 29a009c974f153f72cd5e28851a8cb85a691e215 |
|
05-Sep-2014 |
Alan Newberger <alann@google.com> |
Add additional lifecycle logging to Camera
To assist in diagnosing startup issues, added some logging.
Bug: 17397753
Change-Id: Icc47ec278c0b68c8834bfb52554425ff7f371ea0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a31162ce3ab4f9c68e46658b16b2c49f4dc0d145 |
|
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Add countdown timer to CaptureModule.
Bug: 16654225
Bug: 17204673
Change-Id: I914094b204743ddbe786ef1a7621564e864ed834
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 392f249b8295509cf6c31984f2420b876ca5a7ac |
|
23-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
|
| 4c1bffecc94cedf56d188eca40bd65a854746413 |
|
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable switching within CaptureModule to HDR+ and back.
Bug: 16945820
Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2192fbaaf598d4440a8d537a70095ea56bc9a5eb |
|
20-Aug-2014 |
Sol Boucher <solb@google.com> |
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
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 34264dab0b30bfcc3af38c3211d5a9cf9f9932e6 |
|
19-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
|
| 00a390e17672cc81bc15b8478f27019358e6d6a4 |
|
19-Aug-2014 |
Alan Newberger <alann@google.com> |
Remove extra parent mode from array, and make PhotoModule scope string public
When pruning modes, we neglected to remove one of the 'photo' parent modes.
This still worked because the last two entries were both 'photo'. Also,
making PhotoModule scope string public so it can be referred to by
other modules, to accomplish the same parent function as the array.
Bug: 17103121
Change-Id: I574e9a7c2db8bf2c86d810c930fbf510d5aa1a24
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 66d3d0d0633324893b89e1ddec14a4710d8034c3 |
|
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
add functionality to enable/disable clicks on a MultiToggleImageButton
without affecting its visual state.
bug: 17014507
Change-Id: I824e07d518cce9768cf48f4c50afe079ebff4121
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 44ce4b26614f85518d548a6750c7a08908ae3596 |
|
05-Aug-2014 |
Sol Boucher <solb@google.com> |
Enable seamless switching to/from camera2-backed Photo module
This supports running individual modules against the camera2 API framework while
the rest of the modules use the legacy Camera class.
Bug: 16875535
Change-Id: Ic0ae313a3dd96ba22bacc36c7b1712b183b713ff
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| e9a226f6c9cf7e59a57bab7e99926647fd0fc23f |
|
08-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
|
| 282655f4d66c24c5d2f4ea696f53a345e31926dd |
|
08-Aug-2014 |
Alan Newberger <alann@google.com> |
Route zoom value through to zoomIndex in device API
Current UI is wired to track zoom index, so pass that in rather
than the unfinished new zoom ratio API. This finishes the fix for
zoom in the app.
Extended TODO already there. App should continue to operate until
one big refactor moves it form working with zoom indices, to working
with zoom ratios, no breakage in between.
Bug: 16527845
Change-Id: I8d88c3d34ba9ad85b1a115cf1249548a16722a38
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 73ec9851f8e92968ac50193916526afd8f1343fc |
|
25-Jul-2014 |
Sol Boucher <solb@google.com> |
Move display orientation calculations out of app code
Because they're needed by every app, these are being relocated into the
portability layer. As such, the CameraUtil#getDisplayOrientation() and
CameraUtil#getJpegRotation() methods are being replaced by the API-agnostic
CameraDeviceInfo.Characteristics#getPreviewOrientation() and
CameraDeviceInfo.Characteristics#getJpegOrientation() calls, respectively.
Change-Id: I5048e6f1a5ff655e4ea260b109e7c104bbe790b0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.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/PhotoModule.java
|
| 71ae986c611c49674d53af48e56da629de0ace93 |
|
18-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of dcea7639 to ub-camera-glacier
Change-Id: I151b172d3e415a529375351ba8c038308e593cd5
|
| dcea7639255d5bc4b17a5976bb84de1f6dba0ed1 |
|
17-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Speed up lockscreen start-up time.
Bug: 16375664
- Avoid unnecessary camera open/close loop (~350ms)
- Don't load sounds and do other init work when not needed.
Change-Id: I5d297913dcbd3100034c3915119cc3c818f330d3
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a899a5a5052921b6e5f172b8ebe06d1e2f84c7f4 |
|
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call.
* commit '3c6de14b6e771b6eab84428d53543b066324b8f0':
Work in #onPictureTaken will be on a forked, so no need to fork the call.
|
| 3c6de14b6e771b6eab84428d53543b066324b8f0 |
|
14-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Work in #onPictureTaken will be on a forked, so no need to fork the call.
Bug: 16217551
Change-Id: Id9f6e129d402d5e58cf5f63380c5bf13ab996431
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| af374822959b95dd8ede91a03fa43b9bcf60cd83 |
|
01-Jul-2014 |
Doris Liu <tianliu@google.com> |
Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake
|
| 1b515da04984c90d4f43dbd921503c20ebda9201 |
|
01-Jul-2014 |
Doris Liu <tianliu@google.com> |
DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"
Since there is a small percentage of users still on K-MR1 as of June 30, we
will revert this CL for fishlake (only).
This reverts commit 2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d.
Bug: 15986316
Change-Id: I10283032e2873d07a51cfc697801b04977b3b18f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8d92caac9849e962de3c22b5e327ab4f8fb9b0bc |
|
01-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
* commit '9f3d01d9c5d2200882de76e309db55d74d950110':
volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
|
| 9f3d01d9c5d2200882de76e309db55d74d950110 |
|
30-Jun-2014 |
Spike Sprague <spikuru@google.com> |
volume button cancels ongoing countdown
prevent volume button from doing anything during intent capture review
bug: 15141921
Change-Id: Icf974de09eb59e92bcce4a14aaa4775e21043c13
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c8df26bf7eae262a13036fb63eb1a4926735cabf |
|
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
am 57d4f74f: Ensure focusAndCapture() is called on the main thread.
* commit '57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5':
Ensure focusAndCapture() is called on the main thread.
|
| 57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5 |
|
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Ensure focusAndCapture() is called on the main thread.
Bug: 15863231
Change-Id: Ieeb6e61e5a8a1d49832ea8ded6de2575afb0bdad
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b7c7d9a067cd52a27cfbaf0714a2074f972d836d |
|
19-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Add metadata to capture and tap to focus events.
Bug: 15646701
Change-Id: Id290935839a81cfe86e9a503849207d828f33225
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 3689d13faefecdaf96d3f880b9095edf443a3c07 |
|
24-Jun-2014 |
Sol Boucher <solb@google.com> |
Merge "Replace uses of CameraDevice#getCameraInfos() and CameraInfo" into ub-camera-glacier
|
| 4a0042759b9521bf36dc0d8576a628f4a29b2bb5 |
|
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
am b7c7d9a0: Add metadata to capture and tap to focus events.
* commit 'b7c7d9a067cd52a27cfbaf0714a2074f972d836d':
Add metadata to capture and tap to focus events.
|
| 21a623616162d75978945766f2c2246655c1e4f4 |
|
24-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
resolved conflicts for merge of e1547937 to ub-camera-glacier
Change-Id: I15a68218f95e0f9192d91628ad972a7815e4ec73
|
| e154793797851ebbfac13e209ae49696e9c43912 |
|
24-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Hard reset HDR off if HDR+ is supported.
HDR and HDR+ should not be activatable on the same phone.
Our app depends on this assumption, so in case the app is killed
in some way to prevents us from going to gms core to get the
right information about hdr/hdr+ support, force HDR off if HDR+
at any point is supported.
Bug: 15310749
Change-Id: I450671d1218679ac8d413a01c5857030ba6ea32a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 43e1813a5d4a59ef107768eb523d76ae2781cb02 |
|
20-Jun-2014 |
Sol Boucher <solb@google.com> |
Replace uses of CameraDevice#getCameraInfos() and CameraInfo
This API 1--specific portability library method has been removed. All
non-debugging direct uses of the Camera.CameraInfo class are also addressed by
this commit.
Change-Id: I551bb1476a26f79c101892336d0bf99e4fa823cc
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 831347d9cb5c0e3f03db7aadfc89e91b231104e7 |
|
17-Jun-2014 |
Angus Kong <shkong@google.com> |
Migrate to use new CameraSettings.
Totally get rid of Camera.Parameters.
Change-Id: I147b88f77ecab52600088a10417c3eac3d7fd340
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ca8d97fda9470f575de1f68ee90d6ab0047644e0 |
|
19-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Fixing bad manual merge to fix build.
Change-Id: I0a96593e72240de5e1ffa562704b30932fddb4f3
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c0e03f7d0ace14431e2390d76c90080d4970cf69 |
|
19-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 1bf0889d to ub-camera-glacier
Change-Id: I5281f7c362165bc5a9d0790601fd8d1b29a71d4e
|
| 6190c36db653e848f29d1caefc4fa1bb61e8a662 |
|
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
New Settings API
Based on discussions from last week and comments on the design doc,
this api begins to implement the following:
1. Adds a "Scope" variable to api, which tells the SettingsManager
whether the setting can be stored globally (so that it is visible
to all parts of the app), or per-camera, or per-module, or per-
custom scope that the api user provides.
2. Separates keys and default values from SettingsManager,
to make it easy to add new settings/defaults from third party
modules.
3. Stores all settings as strings, to avoid upgrade errors, and
handles casting to type requested. Only String, Integer, and
boolean are supported.
4. Opens SharedPreferences files on demand, depending on scope
argument.
5. Creates a "DefaultsStore" to hold the defaults and possible
values of a setting. Then a user can request the default or
possible values of a setting at any time.
Change-Id: I03e0e1dd0955c519f54112e89716014aa963a425
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1bf0889d8a40ef9f1a56439563ae76688fd69716 |
|
18-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Remote shutter should focus before taking a photo.
Bug: 13929364
Change-Id: Ib6fd83186100c67aef613f93bb8f9ea780da9ceb
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 5a344964cb003525727c31d295ca3a592c245606 |
|
17-Jun-2014 |
Sol Boucher <solb@google.com> |
Remove cameradevice subpackage and point references at ex library
This code is being relocated into frameworks/ex for availability to other apps.
Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1ec930eb7cc0ef2b02e997833b712bd8b768bdf9 |
|
17-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am 09a46ccb: Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601" into ub-camera-fishlake
* commit '09a46ccb10504579417609d2486dc28e92458bf7':
MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601
|
| fb33336bc6f4b70b0686b5e060819d6bd41f3b6f |
|
02-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
MotionManager for motion-aware focus unlock in Camera2. Second revision.
Bug: 14222601
Change-Id: I36637483b0d7efa2950cd93482de8f1e83bfa8aa
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 120e20acf7005fcc66f3b751521db998c2cb4531 |
|
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am 811a814d: Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"" into ub-camera-fishlake
* commit '811a814dc3a2221048c1b23206a9d0a4bf9b6901':
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"
|
| a51ccbf170d65079c159d9754fbfe1f5164c8539 |
|
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am bacc2584: Merge "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601" into ub-camera-fishlake
* commit 'bacc2584a7c03931643dd4c2d95d6c3f302e4a00':
MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601
|
| 0f54163a7b0ee554e7083e0108153cbc6c9f32e5 |
|
13-Jun-2014 |
Doris Liu <tianliu@google.com> |
resolved conflicts for merge of 2c8ac0ad to ub-camera-glacier
Change-Id: If25e388378acefe505c6bd8fed530eacb0bef6eb
|
| 2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d |
|
13-Jun-2014 |
Doris Liu <tianliu@google.com> |
Remove workaround for K-MR1 that registers redundant preview callbacks
as MR2 has already started rollout, and is expected to finish before F release.
Change-Id: Ifa37a91f5270bb820d5bfb8db03bf21a71f225ff
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 811a814dc3a2221048c1b23206a9d0a4bf9b6901 |
|
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"" into ub-camera-fishlake
|
| 516c11a6885f6e524927bd369567f5bbd592f8ef |
|
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"
This reverts commit ebba3288da5628c9ea7579b63139aa7b7312e137.
Change-Id: Ie82d81aa0440339aba1b762fa78caeb7f7d55312
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ebba3288da5628c9ea7579b63139aa7b7312e137 |
|
02-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
MotionManager for motion-aware focus unlock in Camera2
Bug: 14222601
Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6fbfe5173803b303c883ab2d446f50983cf43c2e |
|
12-Jun-2014 |
Angus Kong <shkong@google.com> |
Merge "Refactor out Camera.Parameters." into ub-camera-glacier
|
| 6607dae6c4d1ee5bbf572695c2042d4d9129a730 |
|
11-Jun-2014 |
Angus Kong <shkong@google.com> |
Refactor out Camera.Parameters.
Change-Id: Ibc1ddac509381530e887b7491069e6367e9a6088
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ba0e617e663bd95f0440ae2eac27ea5f7b3dc662 |
|
11-Jun-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disambiguate media types in capture/filmstrip a11y descriptions" into ub-camera-glacier
|
| 159e6e9ca0d0ecb53d49765c75fd7a0b2afef965 |
|
28-May-2014 |
Spike Sprague <spikuru@google.com> |
disambiguate media types in capture/filmstrip a11y descriptions
capture uses current mode for better description string.
filmstrip uses metadata util functions for better description.
bug: 14473074
Change-Id: Id7c87a2cbd3ce5f072f433e74ca6139bf47f2fc7
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| bacc2584a7c03931643dd4c2d95d6c3f302e4a00 |
|
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601" into ub-camera-fishlake
|
| 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/PhotoModule.java
|
| 2321d7ade0013a877fa94ad23185419ebf29c98b |
|
27-May-2014 |
Seth Raphael <magicseth@google.com> |
am cbf2efe0: Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
* commit 'cbf2efe047cc9db55076fca6e69116c32c72845a':
Fix NPE in CountdownSoundPlayer.
|
| cbf2efe047cc9db55076fca6e69116c32c72845a |
|
27-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
|
| 20e20c91089b37e0c6cec07899d6cbe4e6e8151c |
|
27-May-2014 |
Seth Raphael <magicseth@google.com> |
Fix NPE in CountdownSoundPlayer.
Bug: 15222673
Change-Id: I7068bbc8f4c063691647131160bf53fa4dd5f0f3
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 3fcd36f648b4ec966cd64aad28ad5014a2d9b948 |
|
24-May-2014 |
Angus Kong <shkong@google.com> |
am 7dc0fade: Merge "Restore the flash setting after HDR is off." into ub-camera-everglades
* commit '7dc0fade17f0ee776997b7400870265a65d52dd4':
Restore the flash setting after HDR is off.
|
| 3699c41faa811a872f4dc1ab152d9a7ea89a0590 |
|
24-May-2014 |
Angus Kong <shkong@google.com> |
Restore the flash setting after HDR is off.
bug:15162517
Change-Id: I4b159b6f9067ddde975d3b7692b781a9b18c8eed
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 9d1d4f46fe60ce4d3e6f61ce1c108e4ec1530d2e |
|
23-May-2014 |
Angus Kong <shkong@google.com> |
am 293b9628: Merge "Disable flash when HDR mode is on." into ub-camera-everglades
* commit '293b9628a54ee3871f448e6f66fdc00d82d4adf2':
Disable flash when HDR mode is on.
|
| 8c07fe97bc1b28e3c612ab9979e439cdeb8e59f2 |
|
22-May-2014 |
Angus Kong <shkong@google.com> |
Disable flash when HDR mode is on.
bug:15162517
Change-Id: Ia63b36e5c83e805080ed518a1d6a9bdf686b7d44
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 164916d6c6caac9e87bf4422ad128f87af02c1b7 |
|
22-May-2014 |
Seth Raphael <magicseth@google.com> |
am 73b109e7: Merge "Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator" into ub-camera-everglades
* commit '73b109e793fb8ca3c894eb3df5ee42e1f2a7e27f':
Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator
|
| 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/PhotoModule.java
|
| 721c26135557442771a4b444178292d30eab8543 |
|
22-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am 404126e3: Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page." into ub-camera-everglades
* commit '404126e35045c82ca89a090407cd3ad4a8cf2c3b':
Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page.
|
| 53b6bde32a3d77fcd583f398aacc42cbec3fc8c5 |
|
21-May-2014 |
Doris Liu <tianliu@google.com> |
am 6809eb84: Freeze the screen during camera switch to hide visual distraction
* commit '6809eb840f358430d3032c0532fb42d6dcfd06ef':
Freeze the screen during camera switch to hide visual distraction
|
| a47397fbc04c90de4b47f98040d558821b369a01 |
|
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am 489293d4: Merge "Add timer duration to UsageStatistics." into ub-camera-everglades
* commit '489293d47c7c9f8e63b3462c87fe8e30ebe138e8':
Add timer duration to UsageStatistics.
|
| 404126e35045c82ca89a090407cd3ad4a8cf2c3b |
|
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page." into ub-camera-everglades
|
| c0a85390c2045ae1a8a7c9686c24c5136509a620 |
|
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am b514cdea: Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-everglades
* commit 'b514cdeaffca52da323481293e3b9117de04d375':
Show timer option in HDR+ mode and as disabled.
|
| 6809eb840f358430d3032c0532fb42d6dcfd06ef |
|
21-May-2014 |
Doris Liu <tianliu@google.com> |
Freeze the screen during camera switch to hide visual distraction
Bug: 14818897
Change-Id: If6df2a6d0783e27807f01f8518244df33c24647f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 90c7ad5159145227349b389074d2d9437a1243a4 |
|
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up
opening of Settings page.
Bug: 15090067
Change-Id: I1eea24adbf55bf6a73b02b129b725415edca859c
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 547d7c840265e645a41a9f58ad296e4fbdfcbaca |
|
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add timer duration to UsageStatistics.
Bug: 14364757
Change-Id: I74505834d4d7b94154722c63cf52110d410c955b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b514cdeaffca52da323481293e3b9117de04d375 |
|
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-everglades
|
| 4333fac867f6f6a11235b16d305dd197093b44d5 |
|
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Show timer option in HDR+ mode and as disabled.
Bug: 15089347
Change-Id: I366cd0b553808d55136c141bc1efec6ada9ee9b0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f4b7cf9f3dce05c1e093c577cfc0030d8fcb0161 |
|
20-May-2014 |
Doris Liu <tianliu@google.com> |
am c40bb33f: Merge "Fix squished preview after startup apsect ratio selection" into ub-camera-everglades
* commit 'c40bb33fef476f0edccc2234520eb48f49571118':
Fix squished preview after startup apsect ratio selection
|
| c40bb33fef476f0edccc2234520eb48f49571118 |
|
20-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix squished preview after startup apsect ratio selection" into ub-camera-everglades
|
| 6a8ae81aac9487e87d23a8afc65b2dc0c409c418 |
|
20-May-2014 |
Doris Liu <tianliu@google.com> |
Fix squished preview after startup apsect ratio selection
Bug: 15085976
Change-Id: I7f787799201caf13da42d4f7b56806a494ae7c80
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 15473d4b69f4ad619aa10430e4bc86ab4fa815d0 |
|
14-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add new hdr plus flash setting.
This setting will be used by GcamModule to manage their
torch mode. It should be different from the Camera 1 api
flash mode setting, because they are semantically different.
GcamModule needs to set enableHdrPlusFlash in the BottomBarSpec
to enable this feature.
Also normalize names, HDRPLUS/hdrplus -> HDR_PLUS/hdr_plus,
for consistency, to reflect the clear majority usage.
Depends on:
* GcamModule ag/465936
Bug: 13076855
Change-Id: I6fe5ab8b1c7b9fa1acd1181445748c0257d21ea4
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 203abe5913394239a1e888d71d56597b68f84f62 |
|
19-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add grid lines and flash states to capture logging.
Bug: 14364757
Change-Id: Ibf40c041d508f4406ead273dfdcb1c051a6f83a2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 4245502e9bba736e425c190894cfc928ae0b5e48 |
|
20-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add back countdown timer" into ub-camera-everglades
|
| 6c75164c89f3bbd4f894b9c49a7914a24268a999 |
|
06-May-2014 |
Doris Liu <tianliu@google.com> |
Add back countdown timer
Bug: 14222651
Change-Id: I482ec942dd9d79c4ea0432140a96ba2fc5b29c57
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| e811b29f6707a6ea8f066e6f5b9cb0fc99d2dcd6 |
|
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Change the texts in the aspect ratio selector screen.
Bug: 15024081
As per request from Jake, we don't show the megapixel count anymore but
instead show whether the result is cropped or full sensor. As we limit
this screen to N4 and N5, the texts can be static to cropped 16:9 and
full-sensor 4:3.
Change-Id: I309d52c050ddbce5fe3c85db417adf79129cd141
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 05927e466d0288a0ea971ac543f5039246875f3b |
|
19-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Set a preview callback with a buffer size to force update preview callback stream" into ub-camera-everglades
|
| cb8215ef6efaf379adf0e0c45c655ac3ec9a5638 |
|
19-May-2014 |
Doris Liu <tianliu@google.com> |
Set a preview callback with a buffer size to force update preview callback stream
This is the workaround for the same issue that causes b/12210027. It was fixed
in KitKat MR2, so we are applying the workaround on KitKat and MR1.
Bug: 14954941
Change-Id: Ifba3f9d47769884e81a41277f858e5c7aef41803
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b32af4faa94a06aaefdd0e49392c9da0ec10bfb8 |
|
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Format the megapixel value on the start screen same as settings.
Bug: 14955075
Change-Id: I1a57a0f9c884ce62cae97c77323c19c390fe2ee7
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 40caf2569cf1d27fd4a4aa9e3cf41f44a9a24075 |
|
14-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Reduce jank after aspect ratio change." into ub-camera-everglades
|
| 08b0cddea8e7390bd21053d3049ea165c759d4db |
|
14-May-2014 |
Doris Liu <tianliu@google.com> |
Reduce jank after aspect ratio change.
Also addressed the comment for persisting size in ag/464575
Change-Id: Ief38bf53fdb12016fb6106d712b93dc4aaf048ee
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 9d2c5f91da124ad118ce6fef2baaa5832e4e4655 |
|
14-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "added null check to PhotoModule bottom bar spec for exposure comp params" into ub-camera-everglades
|
| db8f97582d09cd36eee8cfe4ed43182bff63f8bd |
|
13-May-2014 |
Doris Liu <tianliu@google.com> |
Start up screen
This is the 2-step full screen popup:
Step 1: (Only for new users) Choose whether geo-tagging should be on
Step 2: For new users and upgraders to choose 4:3 or 16:9 preview
resolution to take advantage of the screen size.
Change-Id: Ibffe5a807cc622a3945b9fd869de1bf7dd660849
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8f7425cad99f6be58b76be9d8acc1f456ad0e868 |
|
12-May-2014 |
Spike Sprague <spikuru@google.com> |
added null check to PhotoModule bottom bar spec
for exposure comp params
bug: 14624240
Change-Id: Iafbf97d1a024583b81497e7c0ffe4c1848c184df
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1dad685ad3a16136b0b2108e566535c460f2a965 |
|
07-May-2014 |
Angus Kong <shkong@google.com> |
Merge "First Step: CameraCapabilities intead of Parameter" into ub-camera-everglades
|
| 88289047ba6928e317d17f2e1d4b013693545c67 |
|
23-Apr-2014 |
Angus Kong <shkong@google.com> |
First Step: CameraCapabilities intead of Parameter
To get rid of Camera.Parameters, we need to provide our own interfaces.
Camera.Parameters actually consists of 2 parts: capabilities and settings. We'll
provide two interfaces and will just use Camera.Parameters inside of
CameraManager implementations.
Change-Id: I53922b6d740835412d74365374a6a0382129564e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 454d63f617489281971fb151abfe14730209c047 |
|
06-May-2014 |
Angus Kong <shkong@google.com> |
Add cropping for nexus 5 to support 16:9 sizes.
Based on Seth's proposal of faking a new resolution setting.
Improvements made:
1. Move the cropping to a background thread.
2. Refactored to start the preview early to avoid jankness from waiting for the
cropping.
3. Fix the wrong width and hight in EXIF. The original logic is to use width and
height from the camera parameters. Now this is not true anymore.
4. Add check for Nexus 5 for the support to take effect.
Change-Id: I37515fc394b31539644a33b6d32840baf205e15c
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0b9eb5bb8d2ef409e8c88196c0c82c8ece65728b |
|
01-May-2014 |
Angus Kong <shkong@google.com> |
Cancel onResumeTask when the app is paused.
Also change the camera closing conditions to force close all camera before
killing the handler thread.
bug:14190951
bug:14441425
Change-Id: Ic752b0678530b34eb3710bd7796cb17d15452013
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6db1236ecd6b33b4fd1042570cc0d725634a5276 |
|
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
resolved conflicts for merge of e903ae3f to ub-camera-everglades
Change-Id: Ic0ea3fdfd5bad7ea3a576c3bc1ab7fddd7b557bc
|
| e6374b76bd10c7e9120b8530b2dae0f4b321ceea |
|
26-Apr-2014 |
Spike Sprague <spikuru@google.com> |
fix free space calculation / querying timing problem
also, be (a little) more agressive about updating
available storage space so app generally has the most
up-to-date space calculation more often
bug: 14275001
Change-Id: I1aa91419be017f1248bb4b3b0aa805bd4e1b05c6
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 00b7b10987b38c362cc88600aad58890d531bf35 |
|
25-Apr-2014 |
Angus Kong <shkong@google.com> |
Use Point to back up util.Size.
Change-Id: I125d290ee94c9acadf77c50c6c9c0b9b24df4a88
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 634246650a5ae72bb80ab4fe4be5da1afa23b684 |
|
23-Apr-2014 |
Angus Kong <shkong@google.com> |
Use util.Size to replace Camera.Size.
Change-Id: I77784d339a09f24afbf96dc5ef4ce2ac2702b356
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f9cba4ed77bcac695c3b0a6bc7d20dc9dd07db02 |
|
22-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE - Remove SmartCamera (Part 1/2)
Bug: 14254411
Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1045fefdf22bd58fa911b100e7db5750f7efa3e6 |
|
21-Apr-2014 |
Angus Kong <shkong@google.com> |
Create cameradevice package for camera management.
Change-Id: I73c69a70736b0b0eb0ef069a7876cf75fee91262
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 30f339e53b305de5d95c727f14414419f828527b |
|
17-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "make manual exposure compensation settings work acrss different devices bug: 13967706" into ub-camera-everglades
|
| a479fcaad5b83c8fbb881f491d93145531b25cba |
|
12-Apr-2014 |
Spike Sprague <spikuru@google.com> |
make manual exposure compensation settings work acrss different devices
bug: 13967706
Change-Id: I2ebe579c8b7df1218546dd888b5bbfb5486e9e55
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| bca64bf23a875c5ebb2e342834550e98a30cd39f |
|
17-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't block the main thread on remote shutter code
Bug: 14135621
The current RemoreShutterBridge is doing a bunch of heavy listing,
so it shouldn't happen on the main thread.
Change-Id: Ic1a81e7dfd0a2fd5a7424058a6a27c712ed3ca51
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f92d00ba6f0cdeefbcbf711e9043d53bf136026c |
|
12-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am e08bc042: Check zoom enabled check and null check on zoom ratio list.
* commit 'e08bc0428d3d5695d029f0b412d98db6ff8ac956':
Check zoom enabled check and null check on zoom ratio list.
|
| e08bc0428d3d5695d029f0b412d98db6ff8ac956 |
|
12-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Check zoom enabled check and null check on zoom ratio list.
Bug: 13987837
Change-Id: I45d3edc42a240c866f151c5e23431cd50eec7bc6
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 49edf5203a792e5bab355f21eb0548f1baf7a46f |
|
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
am c6ef756c: Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
* commit 'c6ef756c0eb736c3e43cff13d593f5ad71d2cb7b':
Revert "ZoomRatios might not exist, not crash for logging."
|
| c6ef756c0eb736c3e43cff13d593f5ad71d2cb7b |
|
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
|
| c35768c2ba6769fa8cd22ad88f69729ae216fb3d |
|
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "ZoomRatios might not exist, not crash for logging."
This reverts commit de26138f7821e33cac293e9c78c23b5c4612dcd2.
Change-Id: Ia788ef858cf2bc8891a5bbbf1a538b49d583247d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b44cc385e699d0cda1457dd2b9a1548248e9845a |
|
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove an ICS workaround calling stopPreview.
Bug: 13966525
Change-Id: I3592906a6220b6af228fa42ef77e5b0d6e19e7b8
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c089fdce065ef216738dd2854345cc5c02a23b9f |
|
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE Don't call stopPreview after taking a picture on the m8
Bug: 13966525
The proper solution is to remove the stopPreview call completely,
but as we have only limited time for testing left, let's be
careful and target specific devices only.
Change-Id: I5aa90b7c72068bae5352a8396e39a2c82ac137b9
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| dcb6f94d095b2e15a8c924d986a3d850b7b13b83 |
|
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9ac314fb: Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali
* commit '9ac314fb42435a090f33e9db051ab0f203484722':
ZoomRatios might not exist, not crash for logging.
|
| de26138f7821e33cac293e9c78c23b5c4612dcd2 |
|
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
ZoomRatios might not exist, not crash for logging.
Bug: 13987837
Change-Id: I77b8863b60cf5311ffd326015e612dfaeb45daa2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 5031c26af8d38b026d8af94f98acfe524cc2da33 |
|
10-Apr-2014 |
Alan Newberger <alann@google.com> |
am 63da42d6: Merge "Tweak log levels for photo, video" into gb-ub-photos-denali
* commit '63da42d610376d2fc02c0ac453d5df3a1e885504':
Tweak log levels for photo, video
|
| d41766fc59fbcc184d891fde2873cca2309a2585 |
|
10-Apr-2014 |
Alan Newberger <alann@google.com> |
Tweak log levels for photo, video
Adjusting log levels to insure some simple state flow statements
are printed for all clients at info, plus a few other adjustments.
Bug: 13737123
Change-Id: Ic58b2ad44067253960d68678c34d82895f49f6a6
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f4985d0f5183259c7b17ff61017a623828e8348f |
|
07-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am abf54e29: exposure compensation control is back
* commit 'abf54e2994961395a0feb0b08353e62718443f23':
exposure compensation control is back
|
| c5f382f9c5921feec7ba4756ced8331474d976d0 |
|
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am b5b2e4a7: Merge "Fix hdr check." into gb-ub-photos-denali
* commit 'b5b2e4a762db8a8608df0508312d5329ddd243f9':
Fix hdr check.
|
| f3e528c6928655b171ddca4d05d0d99e862bbf4f |
|
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 0bfc7619 to ub-camera-everglades
Change-Id: Id95979da7701d52f1c25ddba710686465a8ba60d
|
| b5e96a53a312163bbe6177de405f2ac779daf090 |
|
07-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 45810372: Merge "Fix broken shutter button enabling in Photo and Video." into gb-ub-photos-denali
* commit '458103727c23134f3c9fb678dd757f31779f6db8':
Fix broken shutter button enabling in Photo and Video.
|
| f33880ba31aebb4d5e993bd8e8d7f715242fb984 |
|
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 94dea6e4: Merge "Refactor UsageStatistic so it can be disabled more easily." into gb-ub-photos-denali
* commit '94dea6e4d1744aeaa5001a5023fb0a7ecb124128':
Refactor UsageStatistic so it can be disabled more easily.
|
| abf54e2994961395a0feb0b08353e62718443f23 |
|
27-Mar-2014 |
Spike Sprague <spikuru@google.com> |
exposure compensation control is back
bug: 13607051
Change-Id: Ib4920ba3f8f3a548651a2d07613ccfdc28ca1d6e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6b9743a03f4674974a8675c12f67149e2d7e017d |
|
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix hdr check.
Change-Id: I7ebd06a985fbc0661d71b189fe1fdbf620f1c341
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 10c5816e1ff3d30e4c4996643ba05d63d522b81a |
|
29-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Logging revisions.
Bug: 13747555
Change-Id: Ic5f735de89f9a69d981cdeab209b3966532697c7
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 458103727c23134f3c9fb678dd757f31779f6db8 |
|
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix broken shutter button enabling in Photo and Video." into gb-ub-photos-denali
|
| 667630d16a2b0cf3acecb817b3aa398abdd33623 |
|
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix broken shutter button enabling in Photo and Video.
When I went in to implement globally disabling the shutter button during
a certain state transition of the app, I realized that
1. enabling the shutter button in Photo and Video was totally broken: the
methods being used for enabling the shutter button were totally empty!
2. setShutterEnabled in the AppController was totally empty.
3. we've done a horrible job with keeping names consistent: capture button
!= shutter button.
So I've fixed all of these things, which should solve existing bugs and make
my original task easier.
Change-Id: If1ae3b8c740ef678fbd20c2ffbb93576f48c8c19
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a83ec8a3acb174e2688f0d31f2094e1aa72a06ee |
|
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Refactor UsageStatistic so it can be disabled more easily.
Change-Id: I2ca6e7d5642b1400d4b13f2c45cb48793b2fc178
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 63ab7ed46e9c8a74d3bd95a4215ea7c392e938c5 |
|
28-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1ca516f2: Allow modules to hard reset settings to prevent out-of-sync errors.
* commit '1ca516f2b612f91e0857ca87d978d39c2aba7c8c':
Allow modules to hard reset settings to prevent out-of-sync errors.
|
| 60f4d74c66e47439c6213b331d73c8a50a284363 |
|
28-Mar-2014 |
Doris Liu <tianliu@google.com> |
am c51b5d24: Merge "Remove white balance and non-HDR scene mode settings" into gb-ub-photos-denali
* commit 'c51b5d242f95442f75cd46e84bf91087c18f65be':
Remove white balance and non-HDR scene mode settings
|
| 1ca516f2b612f91e0857ca87d978d39c2aba7c8c |
|
28-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Allow modules to hard reset settings to prevent out-of-sync errors.
Bug: 13663716
Bug: 13507557
Change-Id: Ie4e66c356c69c3a75a568dae13ddd2d42f60179e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8ad8ad4841f65ee89e3c5e79f57d95cf8e4438b4 |
|
27-Mar-2014 |
Doris Liu <tianliu@google.com> |
Remove white balance and non-HDR scene mode settings
Also hook up HDR setting with scene mode to ensure it functions correctly
Bug: 13546569
Bug: 13546102
Change-Id: I71ef1841fc2bcb22f6ca0e286c31806ea049c79e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.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/PhotoModule.java
|
| 5596b4c902dcb685928b43678f428746ca5ffd08 |
|
12-Mar-2014 |
Angus Kong <shkong@google.com> |
Use debug.Log instead of android.util.Log.
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
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ddbec4d1c3a0e2a796de65c226d5d2621a4d0d21 |
|
26-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2fc87a73: Merge "Clean up stats stubs." into gb-ub-photos-denali
* commit '2fc87a7338d34d8d7383eeea3a367893961a6ac5':
Clean up stats stubs.
|
| f7d4ebac5b4a8093b37d35fd0d650380dae8c8e4 |
|
26-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Clean up stats stubs.
Change-Id: I3e2aefc2a1e4c5086af43fea18cc39963cfd0c82
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d26f305dd9eb20d23e808ed8a2f1f37de0d9261e |
|
20-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 7a4364b0: Merge "Prevent rapid HDR+ switching from causing illegal state." into gb-ub-photos-denali
* commit '7a4364b0ef54fe4b02a108b0181d10d3f7feda96':
Prevent rapid HDR+ switching from causing illegal state.
|
| 4cdaf5178704224673d0e7ba948830d1cabd8fa0 |
|
19-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Prevent rapid HDR+ switching from causing illegal state.
Bug: 13524559
Change-Id: Id8b2ebbfcdbf5e9b32a0f580adb6fe4754143396
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 459c12ebaf5dbf71d2c775c4f3fbf5fd8d6a97c7 |
|
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 57a16b12: Merge "New resolution settings. Two for each camera." into gb-ub-photos-denali
* commit '57a16b1204081250a7d510d30c47fdd5c2108fa5':
New resolution settings. Two for each camera.
|
| 6ccec205c8d43757bcefd0202eb0cde0df020574 |
|
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
New resolution settings. Two for each camera.
Bug: 13025151
Bug: 13349351
Also fixes the issue of summaries not showing up before
changing a resolution setting.
Change-Id: I63482a79e742c0403ebf556148f7a12d4e6c8b0e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| bd0164520726d75fbab38b6a01b2942d35549c33 |
|
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix build. Got broken with last manual merge.
Change-Id: I69131a478a26a15057acd1af7a96ab81149eb111
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| de51c81f9870abf1e20868bbf00c20ecb6b2fb9e |
|
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 7cb8c791 to ub-camera-everglades
Change-Id: Iad7e7f78ae8e48456493451a62b154fa0e6c8cb3
|
| 7cb8c791df0bcb48b2c3f2f34d7c7538c619b592 |
|
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Spring cleaning. Throwing out old cruft.
Change-Id: I99952405a0036c4a518b31e543a72a84dbe07995
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 59953a2bd28fa476bcb200623fe21da2f64f46ad |
|
08-Mar-2014 |
Teresa Ko <teresako@google.com> |
Move startSmartCamera call back into onPreviewStarted(). (onPreviewInitialDataReceived() doesn't seem to be called anymore.)
Change-Id: I25455dd8e1076150be37e419c73d5e5447c144d2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| dc5a16739fc125fe1195aabb51745b53522e596d |
|
07-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
am 261307a0: Merge "Manage location recording state only in CameraActivity. Bug: 13230126" into gb-ub-photos-denali
* commit '261307a033cb3a5c2196ab4cdb3069d319dd64ae':
Manage location recording state only in CameraActivity. Bug: 13230126
|
| acad83540bd77c2c64e69fdbacd356985734fd87 |
|
07-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Manage location recording state only in CameraActivity.
Bug: 13230126
Change-Id: Ia36b55e6678d1caa2ab5ba553f991e26664ea9ba
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 02f1f90809f5fee616dd64c7c5b60dc28510b9bb |
|
05-Mar-2014 |
Angus Kong <shkong@google.com> |
am 7d1d6057: Merge "No switch camera when switching camera" into gb-ub-photos-denali
* commit '7d1d6057817ff5b47129a07ce355afb74cdab88b':
No switch camera when switching camera
|
| 7d1d6057817ff5b47129a07ce355afb74cdab88b |
|
05-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "No switch camera when switching camera" into gb-ub-photos-denali
|
| d494b9afc833b966863df04d5560e73fc7e0125d |
|
05-Mar-2014 |
Alan Newberger <alann@google.com> |
am acb0802c: Remove onPreviewReadyToStart from PhotoModule
* commit 'acb0802ccfa23723686a154806c6ba2d6cba453f':
Remove onPreviewReadyToStart from PhotoModule
|
| acb0802ccfa23723686a154806c6ba2d6cba453f |
|
05-Mar-2014 |
Alan Newberger <alann@google.com> |
Remove onPreviewReadyToStart from PhotoModule
Removing this call results in no jank or loss of function on tested
devices, and resolves an issue on certain devices where starting the
callback prior to the preview results in a permanent mode cover. This
issue was not observed in any other mode, i.e. video is working on
warm start for all tested devices before and after this change.
Bug: 13078926
Change-Id: I7a63011dd96d40466d6bc3bb7f6867552a2b0dc8
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 97e282a3764215ac193726e0d259e55bf94369fe |
|
05-Mar-2014 |
Angus Kong <shkong@google.com> |
No switch camera when switching camera
bug:13234553
Change-Id: I1f26c2c69e5a0aee0ea1962a9cb2837bde94e02e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1da313cd8c2a1089ea6ddbc5a9e162600e0555dd |
|
05-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1ba90e3e: Implement return to hdr plus after switch to front facing camera.
* commit '1ba90e3ea4b8280c28cf6d87e5b4cc6b3b5f1645':
Implement return to hdr plus after switch to front facing camera.
|
| 1ba90e3ea4b8280c28cf6d87e5b4cc6b3b5f1645 |
|
03-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement return to hdr plus after switch to front facing camera.
Bug: 12894444
Change-Id: Ia9c0cba83f0ee99f2156e9e58f4fff1af9b6100f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0f1cd9fe6ea3a575fb25aa0dd1b78622d40595a3 |
|
27-Feb-2014 |
Angus Kong <shkong@google.com> |
am fc1c289d: Merge "Add camera state in CameraManager implementation" into gb-ub-photos-denali
* commit 'fc1c289dff5b91cb9470009eb973325a38f91f4e':
Add camera state in CameraManager implementation
|
| fc1c289dff5b91cb9470009eb973325a38f91f4e |
|
27-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Add camera state in CameraManager implementation" into gb-ub-photos-denali
|
| b82dade76dd940764bfd043a7f7cf19e161c6b7d |
|
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 5d18769f: Generalize shutter button listeners and add one for mode options.
* commit '5d18769f53db81d401488811250570290a73626b':
Generalize shutter button listeners and add one for mode options.
|
| 5d18769f53db81d401488811250570290a73626b |
|
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Generalize shutter button listeners and add one for mode options.
Bug: 13099000
Change-Id: Ib0726c70a9e4aa06197550f29360bacb2dda4783
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 62753ae94be2ae7c08bf24ebcf1c462975af230f |
|
10-Feb-2014 |
Angus Kong <shkong@google.com> |
Add camera state in CameraManager implementation
1. Add camera states.
2. Avoid potentially dangerous camera operations according the states.
bug:11985910
Change-Id: I2bce5c778077473e07f281053a441097fa71e3fb
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 87cfe4df5e2bdd8186d40af42f2f008ae1d1fb2f |
|
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 74913b43: Merge "Implement general upgrade recovery strategies and strict versioning." into gb-ub-photos-denali
* commit '74913b43e731dda86745548fd2070788df2a9b58':
Implement general upgrade recovery strategies and strict versioning.
|
| 74913b43e731dda86745548fd2070788df2a9b58 |
|
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Implement general upgrade recovery strategies and strict versioning." into gb-ub-photos-denali
|
| 4569b7089b4bc7ea6949505b7dd3637778011d7c |
|
24-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement general upgrade recovery strategies and strict versioning.
Bug: 11984903
Bug: 13165733
Change-Id: I2e7f39778fb185c3276ec35f3cc7afc9bfa5a747
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 5cb575db0bfab1686af0c379280e3f317f82bbcf |
|
22-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove SmartCam from Denali. DO NOT MERGE
Change-Id: I94813a13301eb3bcd89eeb96a757763b3e7b34ff
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d9f48fc84115606794de149689680ee912a34fce |
|
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am 8dc0c487: Merge "Remove support for press and hold to focus." into gb-ub-photos-denali
* commit '8dc0c487576d03c5cae3d0e4e609bd9262e2e5a1':
Remove support for press and hold to focus.
|
| eaaf56d5ad909bf8d3eb23a2454983e7731e7644 |
|
20-Feb-2014 |
Angus Kong <shkong@google.com> |
Remove support for press and hold to focus.
bug:11985910
Change-Id: Ibf37468236f1483fe622ffa6adfbde71ec21673a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6dad5340b6b71682d5648f8c548fe04db839c57f |
|
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 267571a0: Merge "To support Refocus orientation refactoring." into gb-ub-photos-denali
* commit '267571a094c55f4d7ebf87180d72e1d5e88b7c31':
To support Refocus orientation refactoring.
|
| a7cbfc04d888624858271facdbf68797c54df8b6 |
|
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
To support Refocus orientation refactoring.
Bug: 13007150
Bug: 12996493
Change-Id: I360d0d0fcf8090d96277cd708bd8d0eb4e188b00
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| e22f526a64b242c1617c8f6f5d2b9abd5ab63940 |
|
12-Feb-2014 |
Seth Raphael <magicseth@google.com> |
am c893312b: Merge "Give Smart Camera a signal to start" into gb-ub-photos-denali
* commit 'c893312b7639d1e9c9c73e29bbb4470e8b8147e3':
Give Smart Camera a signal to start
|
| 3083642a424b74e8f7b898f26a045f438edfa042 |
|
06-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Give Smart Camera a signal to start
Change-Id: I1b31d4cbf81a5865ef0807b07df0f644fa871247
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 3ab5a4ac9bf568934dcfb625e86cc85c36d6e619 |
|
11-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1b1583ee: Merge "New Settings UI and video quality selection logic." into gb-ub-photos-denali
* commit '1b1583ee73c46ecdce8d8d432c39f8f7697ac4f1':
New Settings UI and video quality selection logic.
|
| de30323ee0598ed0e1c8a1ab942c3e16160062d3 |
|
07-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
New Settings UI and video quality selection logic.
Bug: 12467965
Bug: 12935910
Bug: 12575084
Implements the settings as a proper activity/fragment. Also cleans
up some of the old logic we had for handling and displaying settings.
Also has the new L/M/S logic for video quality.
Change-Id: I412af424b74369cef15c7ead2cb09704875972e3
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2d3478635fa18f8d579c43f2b151faa520eb5577 |
|
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 4108d9ac: Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
* commit '4108d9ace2a0f40ad28f8d6530a174f1a0cffe95':
fixing intent ui controls visibility
|
| 4108d9ace2a0f40ad28f8d6530a174f1a0cffe95 |
|
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
|
| 15690d02da08bda74ed63f260b70076801bf91bf |
|
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
fixing intent ui controls visibility
bug: 12668877
Change-Id: Ibffc0682fb37f88998d2afddcf52bcd6ef86192f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 936d3983d7544da87935653f186d9d5132d51e91 |
|
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 62a78dec: Merge "Add grid lines option and indicator." into gb-ub-photos-denali
* commit '62a78decdecd84b516854f2ccbf629d76cdf09eb':
Add grid lines option and indicator.
|
| d5e51466a2848f1c937656c8f8185290034c2429 |
|
07-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add grid lines option and indicator.
Bug: 12454164
Change-Id: Iae088cee0cc67041bb304f276a5ffe84a813df5e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 83f14669bff9ebcdaae22e4d522ef325a461924f |
|
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am d8de077f: Shared texture view in photosphere.
* commit 'd8de077f72b04cee1bdf26e5ca1678ac5297bd71':
Shared texture view in photosphere.
|
| d8de077f72b04cee1bdf26e5ca1678ac5297bd71 |
|
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Shared texture view in photosphere.
Change-Id: I8dd4898e3800b02fa7f0488104dcfa4600b3845f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0dd739eecaf86a3d78ea278210ad6a1bcd93adac |
|
07-Feb-2014 |
Angus Kong <shkong@google.com> |
am fe60979d: Move onPreviewAreaSizeChanged() out of layout pass
* commit 'fe60979d7d7ce78de503404da8e91e118242071a':
Move onPreviewAreaSizeChanged() out of layout pass
|
| 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/PhotoModule.java
|
| 97cb4883316feea9a3a8843f4033f4dd51a5343c |
|
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am a6587a1a: Elevate refocus to its own mode, merge craft and camera.
* commit 'a6587a1a1e3672013da6a454c0e478846eced15d':
Elevate refocus to its own mode, merge craft and camera.
|
| a6587a1a1e3672013da6a454c0e478846eced15d |
|
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Elevate refocus to its own mode, merge craft and camera.
Change-Id: I9686db26993319fdaf09f09c0610bb65e00a0e05
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 25b3580491486028aac1fc983ada7d1032d80d85 |
|
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 846d3abf: Avoid activity leaks.
* commit '846d3abfe3da2fa2a5593c7d40a196005408bed1':
Avoid activity leaks.
|
| 846d3abfe3da2fa2a5593c7d40a196005408bed1 |
|
04-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Avoid activity leaks.
Bug: 12805279
Change-Id: Ib91ff2d286f6a0e0d67dad673e7af24600e15759
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8d800d0d9e23121388d5994bd149826436a66803 |
|
30-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 914a6dba to ub-camera-everglades
Change-Id: I1e5700e8d34e19a09c8098ccf0cdfc64bfd4dbf8
|
| 3b0ab89e3fefd25ae87687420df9315ec860d346 |
|
29-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Changes the picture size settings to L,M,S from concrete resolutions.
Bug: 12575084
Bug: 12717251
The strategy in detail:
- Sort all available sizes
- For 'large', select the resolution with the most pixels.
- Use the 'large' resolution aspect ratio as the target AR.
- Create a list of resolutions with AR close to 'large'.
- If only two more are available, use them for medium and small.
- If less are available, boarden the search in complete list.
- Again, if only two more are available, use them for medium and small.
- Otherwise find medium resolution with total pixels closest to 50% of 'large' and ...
small as 25% of 'large' pixels.
- If they both come out the same, select either one small for 'small' or one larger
for 'medium'.
Change-Id: Ib94fdf0ce987968bccd85abbf5be7bdaa914325f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c630181f9921c8355c41ca3acea7009c57101fcc |
|
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 8389ebe6: Merge "Fix secure camera launch crash." into gb-ub-photos-denali
* commit '8389ebe65ca6f3640b90e24f35339b5f233dee83':
Fix secure camera launch crash.
|
| 8389ebe65ca6f3640b90e24f35339b5f233dee83 |
|
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix secure camera launch crash." into gb-ub-photos-denali
|
| 49ab922e8e1e7535286392fc667312ec419403fd |
|
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix secure camera launch crash.
Bug: 12783858
Change-Id: Iff5cfecff986966f63b40d2db4bc1d31037f12d4
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a26123b9dffb7d186696c72cc2db44d24cbadd58 |
|
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
am 5e6c3e78: Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
* commit '5e6c3e7840b41685ebd27c40ee243a7ae75e7229':
Fix mode transition jank and stretched video preview
|
| 5e6c3e7840b41685ebd27c40ee243a7ae75e7229 |
|
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
|
| 5a367545ab931a308c8d8555ef5a747dc9565caf |
|
18-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix mode transition jank and stretched video preview
Bug: 11963674
Change-Id: I9cb292aa3dea6b0073dfc19af8105dce1f0c9865
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d64a351fb730a2f0d15970d1072e72cb751383e3 |
|
28-Jan-2014 |
Seth Raphael <magicseth@google.com> |
am 8513f7bb: Merge "Clearcut Logs" into gb-ub-photos-denali
* commit '8513f7bbf8ebc2563702b1e35d4894bd8ab7b21f':
Clearcut Logs
|
| 5e09d01d80b64c81f21c57f1b99dd9dc1afed18d |
|
18-Dec-2013 |
Seth Raphael <magicseth@google.com> |
Clearcut Logs
Change-Id: I564a2452cb7f02f899760ac086e56eaa76b174eb
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f2994f02c46e6351fbaadc8a2b24f8feefa53892 |
|
24-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
A first approach for a remote shutter API.
Change-Id: Idd00c6eeef487d32f333ff19eae01dc47856cd09
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b1641f5df0cf839b54385ea4d2e43521620fc237 |
|
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Remove global UI elements based on supported camera parameters.
Bug: 12192238
Change-Id: I6373adeaa9c95385a2a4ca8d81cf7656550911f2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 59401045bf479b2617c981075aec92190ec59aeb |
|
15-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix face view in simple camera
Part II at ag/407562
Bug: 12460604
Change-Id: I9532d5dae7c156568fef944b81127c6ff194a394
/packages/apps/Camera2/src/com/android/camera/PhotoModule.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/PhotoModule.java
|
| dc07ee44ba52f8918f5c629fe6ffcc5ec41c9083 |
|
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Sync dependencies between bottom bar options." into gb-ub-photos-denali
|
| 0a6a8d8e4e1c9796aac606379a42970cdffb8911 |
|
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Sync dependencies between bottom bar options.
* Centralizes the bottom bar button customization.
* Makes HDR+ and front camera exclusive.
Bug: 12469207
Change-Id: I65e3d16d314a26889f04e9bcc26fa4bf095150b7
Conflicts:
src/com/android/camera/ButtonManager.java
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 626961145aab5cb2186d33c5cd44071fb9ee7a61 |
|
13-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Clear the camera instance before switching." into gb-ub-photos-denali
|
| bd1b8f910d6f2c94daac304f4bd1a098939474c3 |
|
04-Jan-2014 |
Doris Liu <tianliu@google.com> |
Centralize camera mode resources
Moved camera mode related resources such as mode theme color, mode
icon, text, mode id, etc to resources xml. And created utility
functions to query for them.
Part II at ag/404854
Change-Id: I828502c76851cc2ed0b632b1ed4bb7f702fee231
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d4109bc69f48cebedc3feec0effddbf65c93f353 |
|
09-Jan-2014 |
Angus Kong <shkong@google.com> |
Clear the camera instance before switching.
bug:12452510
Change-Id: If8bbd4d8a15ce2ba65659c02063da3a2960142ce
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d74e6a1014278e1a05c802e3ed594381288c6381 |
|
07-Jan-2014 |
Angus Kong <shkong@google.com> |
Remove the dependency on CameraHolder.
Change-Id: I39882f1bf2a4cd730d00ceabc7705692bcee6bc0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8b6a5b8a5c527375b01fae8f90590e840c6dcb18 |
|
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make flash state sticky on switching to photo mode." into gb-ub-photos-denali
|
| 1648c36927501ff32bf2918e8a445118d5208731 |
|
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add on screen indicators.
Known caveats:
* Does not respect the first orientation change.
* PhotoModule resets flash to default on a mode switch.
* Hdr plus is not sticky on mode switch.
Bug: 12368905
Change-Id: I377f28c6d0f7115371cc9e9dad9378f049bf7d7c
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 865d4bdd7353ec25584321fd25ea828ac7978a21 |
|
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make flash state sticky on switching to photo mode.
Bug: 12368672
Change-Id: I8ff680efcd4eb55e1773853889580f7f792938a5
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| de3b2d4bab3dc04e6bda1a0c8bdc1d01bd3260dc |
|
06-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Center preview UI in the live preview rect" into gb-ub-photos-denali
|
| 2d60a0b803e5645f93e2cf53bdd272201cadf001 |
|
06-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean-up TAGs and some more auto-clean-ups." into gb-ub-photos-denali
|
| 5850115399516c9186cc0a8231eb1b554f570441 |
|
06-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean-up TAGs and some more auto-clean-ups.
Change-Id: Ib5f01a6fed99dd21b87138d8e4f792aefa74880d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 96f99f43987a4b24bfbe21e12cec1dae752e5178 |
|
06-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Update camera parameters when setting has changed." into gb-ub-photos-denali
|
| 7f0151dff66fed52448056e5f73b15db9485a77e |
|
03-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Update camera parameters when setting has changed.
Bug: 12250474
* Implemented for photo mode only.
* To be extended to all other modules.
Change-Id: Ie5218f3a76acb757ac526d3f987ef3165736b46d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1587b049d4a0ae36630b429804cf52991ffbf66f |
|
03-Jan-2014 |
Angus Kong <shkong@google.com> |
Remove unused code in PhotoModule.
Change-Id: I28611ab68343effffab8b8a00649e5884472fc8a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ca4a5668c5bcda027bd896ebf17c8ef374e2ac75 |
|
03-Jan-2014 |
Doris Liu <tianliu@google.com> |
Center preview UI in the live preview rect
Center flash animation
Center zoom animation
Center focus indicator for auto focus
TODO: Gcam focus indicator is not centered in the live preview
Bug: 12114128
Change-Id: I5e7f79fdf6a705789d995fc3bf3570262bc8bb49
/packages/apps/Camera2/src/com/android/camera/PhotoModule.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/PhotoModule.java
|
| 482de029dc20e0a577388a602985fb31c3200309 |
|
19-Dec-2013 |
Doris Liu <tianliu@google.com> |
Touch to focus
Change-Id: I69860bd05426e3a04bc5fd7d0dd581b5d6ff768d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| db290c33bd0250b473c475254cbfbbd19dd72430 |
|
21-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "New Capture UI." into gb-ub-photos-denali
|
| 4efa8b54c1df4e06f2d3caed2568015a737f9dda |
|
18-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
New Capture UI.
* depends on ag/400799
Change-Id: Ieb0e27447659bcb04dee57348583f68d680408d2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ffbc43c3dd3c94a968a41431fb07645a13696c4a |
|
09-Dec-2013 |
Kevin Gabayan <gabayan@google.com> |
Use Fused Location Provider when gms is available.
Bug: 8295289
Change-Id: I3dba25c35fd3754ff70ed3ecea33052505274feb
/packages/apps/Camera2/src/com/android/camera/PhotoModule.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/PhotoModule.java
|
| e9a6f801c249e2c705bc2931359fe921f69165b7 |
|
16-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing FR and IMM debug toggle buttons
bug: 12165442
Change-Id: Id188babfc8878ad06df4d774144851bf39e83cc2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1dfe7828fd60741b9752553af3ee439c04e758a0 |
|
12-Dec-2013 |
Doris Liu <tianliu@google.com> |
New flash animation
Change-Id: I266b631a5c6feac114467e0a05799ad5e1ffae92
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ba6994d8834db0cb2df60893ccb9af091b23bfce |
|
13-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make hdr plus a global preference.
Bug: 12112662
Change-Id: I4d5b80aa2412982717bd66e4903deef5331a152b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 215f6b08c4dc025b8243baff369da144844f22e2 |
|
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
fix simple camera not capturing bug
Change-Id: I9136b5f4f0738251ddb3cb97ebba150d7e0846f0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a63dbb6231f06031204fe20b19a87d0440bd1661 |
|
22-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Add a capture-session API to be used by all modules.
Bug: 11747284
This refactors the way we think of sessions. Instead of
having multiple session and notification APIs being used
by different modules, we create on central capture session
API to be used by all modules.
This also adds a first implementation of a Memory API which
tells modules about the current memory situation.
Change-Id: I7f030e32fc2f70f4007825ba7bbbdce9521a2bd9
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2b906b8c9754b564d5113c7a342654c82f97f180 |
|
11-Dec-2013 |
Doris Liu <tianliu@google.com> |
Show a camera theme cover until preview is ready
Also removed the toast for tap to take video snapshot
Change-Id: I85025a9d09842097403e5ea7ce7391ea0ed9ec98
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 29f6056b703e627bc65efa74294c7c374a0b8957 |
|
10-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't show tap-to-focus message.
Bug: 12028253
Change-Id: Ifc4385c177dd895f2959429e2575d3ef1d5fcfe3
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 06db742814dd635d100639f977fcfdc904deb778 |
|
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Setup preview status listener for preview related changes
Change-Id: Ibd8341dfbe5e03ec77c149e671f4dd991833e678
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| faaee012acc80ad369cb03df9c196e48140f1e7b |
|
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Re-design callbacks from filmstrip.
Enumerated the possible states of filmstrip and have proper callbacks when
entering/leaving each of the states.
Change-Id: I5a6e931095bb0792e0832fda11d1f1b5ba850263
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f9e4f8fbd1f761443d7a1eecbb5aa221ed3a06a8 |
|
05-Dec-2013 |
Doris Liu <tianliu@google.com> |
Redesign preview Overlay for simplicity
Simplify how preview overlay should be setup from each module
Refactored PhotoUI and VideoUI to use the new Overlay
Change-Id: Ia8c7c71215007c9aaba69e55353b554e8fdf3c90
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 18e2ef6d2b2d36abcaa7378a0f7df792ecf8ed81 |
|
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Create a ButtonManager for managing common button behaviors.
Change-Id: I02d99c393a01e6de9ffb2f4f351a832b4eae9e37
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| e419b1919ed54d8d94d19faec2d02e773ae7ecdb |
|
03-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Remove photo mode dependency on preference groups.
Bug: 11967053
Change-Id: I3058a1931d92fa006da9e16bdcc2b5f864b1eacb
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 095fa44f760234376946cd97ccf262e3df0cd7d6 |
|
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Make onLayoutOrientationChanged to take a boolean." into gb-ub-photos-denali
|
| 2f0e4a3995684c986afad55db7715c15393a9df0 |
|
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Make onLayoutOrientationChanged to take a boolean.
ModuleController.onLayoutOrientationChanged() call back can just take a boolean
to know whether the layout orientation is in landscape or portrait.
Change-Id: I1675cbea263b12bb0b568a6038f0fc17dd03799a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d3253f20d9fc971f7cb6bdef6cd6f96b21f7dd63 |
|
12-Jul-2013 |
Michael Kolb <kolby@google.com> |
Always set focus mode first before applying scene mode
Patching Bryce CL into Denali.
Bug: 9577903
Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ff33b520b30a3faf72623f2889fdae1096a8586b |
|
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "No longer lay out under nav bar." into gb-ub-photos-denali
|
| 773e1c9285bd2d0f03ba87db13e77b4f5197ac4f |
|
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
No longer lay out under nav bar.
Gutted out camera root view that was intended to lay out its child
views correctly when it is laid out under the nav bar.
Change-Id: Iee33daf63dd6a592577f59010f0fc6b71a126f7c
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 637c75c9286f04671f2ba0f83b96a3196e17c898 |
|
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Change to have finer callbacks." into gb-ub-photos-denali
|
| 53ae041d63ee7a251c73ac47abeeb143a2f0da44 |
|
02-Dec-2013 |
Angus Kong <shkong@google.com> |
Change to have finer callbacks.
onConfigurationChanged() is too general since the configuration contains many
things. Should use finer callbacks for each of the changes we care about.
Change-Id: I5ffbb7f1f71e6675a4fbb07e564ae09f55fa5127
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 4497326732ad1ecd836e03fdb386cf9c66cbef1f |
|
27-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Reduce logging of flattened Preferences
Bug: 11901390
Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0744e4ab3ec5f0270bdad33e7c477f52ba680bbd |
|
22-Nov-2013 |
Marco Nelissen <marcone@google.com> |
initial simple camera pruning and refactoring
100% preview and new ui bottom bar
bug: 11514604
Change-Id: I010c8aaa41ad6791ce2443ef159ea22cc1e8346f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2c8cc45f91df492d515ba861508fa2012fbb6679 |
|
06-Nov-2013 |
Sameer Padala <sxp@google.com> |
Update SmartCamera UI
Change-Id: Icf04a24656aaaf2a4dfc948e9d4e9a16b2a51f69
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 635a4b8ba2b8684f95e5cb0aa35c244a06985f4c |
|
26-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Optimize Settings api.
* Caches settings descriptors.
* Uses a hashmap for finding setting descriptor from key.
Change-Id: I97fb536a2b30226896644b56911d4aec3c61cda5
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 13e87c4d06e96e03adc229637f07baf3b56b90d6 |
|
25-Nov-2013 |
Angus Kong <shkong@google.com> |
Migrate from old CameraModule to ModuleController.
The following methods are removed.
init() of old module interface
onUserInteraction()
installIntetFilter()
onPreviewTextureCopied()
onCaptureTextureCopied()
onStop()
onActivityResult()
onShowSwitcherPopup
updateStorageHintOnResume()
The logic of controlling screen on/off is moved to CameraActivity.
Change-Id: I6807ac6bc314bdfcfe47273baf071be94098fd44
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 357b7673f03d9b45d281d585cc3f4f87dc7d727b |
|
21-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Build out the SettingsManager model.
Change-Id: Ie831dbf624efc5c7e27924785a0ec193b3ce53bd
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f55f3c461c5a6ae6b61fa75562ca01683aa93f9a |
|
20-Nov-2013 |
Doris Liu <tianliu@google.com> |
Pinhole animation, quick switch between photo and video
Also, first pass of the view hierarchy refactor.
Change-Id: I6c80191f15908bd24c16b76df6ef92df3ef905fc
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c4e665625b88a8363fa2bd9848bf88ec9b45637f |
|
23-Nov-2013 |
Angus Kong <shkong@google.com> |
Consolidate onResume* and onPause* in modules.
1. Combine onResumeAfterSuper() and onResumeBeforeSuper() to resume().
2. Combine onPauseAfterSuper() and onPauseBeforeSuper() to pause().
3. Add helper function requestBackCamera() to CameraModule.
Change-Id: Ie0ffb0168e2df1e77aba4ead4f8729eca09c894a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| def975daaa81bda4301cc45de6920ac0a0c12fec |
|
22-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Delay onResume tasks to speed up lockscreen
onResume->onPause->onResume launch sequence.
Change-Id: I819ba9893c1fbcf0c6e15a91a5733978dcdb9e1f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 280fd3edae1dc35ac1015bcc9532477169fad3aa |
|
21-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Introduce common services and integrate Refocus end-to-end.
Bug: 11120164
Bug: 10073814
This adds a new common CameraServices interface and a method to every
module to get it. Through this we can expose common services and due to
the interface, we can easily mock them for tests.
Also makes the MediaSaveService not a service anymore.
Change-Id: Ifa093efd4ba53c2955ccc2a990b4f18610c29944
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c120b0f6e5ea919fcbb87f832a2b6c82509a2114 |
|
19-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Custom settings ui with dialogs.
Change-Id: I117744135e5b08370c1feb63fe4abcccfe325659
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 21c21a62aaed42cb0d4c2c91a735f08e40f8cd07 |
|
20-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Initialize a global LocationManager.
Change-Id: I69f76e88f5e5b372bdcf6ba9fba8614e34595cc9
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 10f9092b4f7aa4b69d2aec116015242b98d816fc |
|
18-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Major refactor: Make resources access through app." into gb-ub-photos-denali
|
| 20fad249cbb587b8cf03e8e53bc64ff8e0bec7fd |
|
12-Nov-2013 |
Angus Kong <shkong@google.com> |
Major refactor: Make resources access through app.
1. Make the camera device avaiability a callback event so the process can be
event-driven.
2. Add ModuleManager interface and implementation.
3. Make AndroidCameraManagerImpl implementation package private.
This CL is the refactoring work on Gallery2 side. The other part is
http://ag/389297/
Known issue: only work for normal photo mode and video mode for now.
Change-Id: Ib0a89ca56c00f6a7294192e9737a70dec5143ee3
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 9e039852f11dc5c546df174dd91ef6994b87698e |
|
12-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Add parameters and deduplicate parameter changes
Bug: 11646117
Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e
(cherry picked from commit 77775f170a4596421fd566005522f56f82b1c276)
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d7b8cb57ecbd8776c858b98ca9d1aeed3f22da88 |
|
15-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix a bad rebase.
Change-Id: I8447ba6bbe37e7bea7b1ac579560150830688704
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| dc282e118c398c5138c8f8859b3a1037b3cea672 |
|
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Revert parallel opening camera in photo mode.
Reverts:
* ag/386409
* ag/386206
* ag/385573
Bug: 11598948
Bug: 11625767
Bug: 11627454
Bug: 11255097
Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5
Conflicts:
src/com/android/camera/PhotoModule.java
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1c94b7d0fa0143230d04b9f14c2ff93c6886d6cc |
|
10-Nov-2013 |
Doris Liu <tianliu@google.com> |
Introduce new mode switcher
TODO: Get assets from UX and activate shimmy
Bug: 11514368
Change-Id: Iebfd3c3c2dc1b08db25e166d5f90d3418a67ed22
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1138d7ad2dc727bc256ee42f7603bebb37468b61 |
|
08-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor MediaSaveService for future test needs." into gb-ub-photos-denali
|
| cbd8267ee99e457f72822e8d8187b5e6823104f8 |
|
05-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Add logging to various actions
Bug: 11514148
Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| acf9ab7c3ddc976bc9d6239ae54523b9805c876d |
|
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Ensure mOpenCameraThread has been setup before dereferencing.
Bug: 11579062
Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| fd4fc0e52ad69c2d486f5f46c2d465b4c4ba2849 |
|
08-Nov-2013 |
Angus Kong <shkong@google.com> |
Refactor MediaSaveService for future test needs.
Added interface MediaSaver as the abstract layer to make the implementation
independent of the clients.
Change-Id: I98db3f732e4ed1c87da005b9c18e888682a5e6a5
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c5effbada57112445656bf4929f13f9942afb14c |
|
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix photo mode is getting stuck in a single CameraState.
Bug: 11574716
Change-Id: Ieb3622103798077071bb9350773851b7acbff756
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b09b53efcd179d55836014dcd054cff6f7d688d8 |
|
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Parallelize opening the camera with view handling in photo mode.
Bug: 11255097
Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 404d7eb0029e1dcb94d38b0595fdd84345207b0a |
|
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
|
| 5914783e3f0a1c1c5581361cbf6e0d9ab2cf789d |
|
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
camera: Ensure camera release for lockscreen transition.
Bug: 11063890
Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 95405749e5a96ff680b9bcafbfe2bab33c16e1ee |
|
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
Make sure preview aspect ratio is updated
Bug: 11509233
Change-Id: Ide6f5bbe0abe7ed45e56b3f34c19204c1294afc7
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ba1b30b7793a8a881493a9fc48f27d503db2405b |
|
04-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Check for media service being present before capture.
Bug: 11508325
Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| af714f9ec3264211cb00139ffe0f05d55085ffc2 |
|
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
|
| e546d48b4acfbf2441b685b2c7d6a4e14241f34b |
|
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
|
| cfc148d8373ab69d352c274374ffb34caf4a8d2c |
|
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix crash when trying to reopen the camera.
In this case, another app is using the Camera, such that the camera.open will
hit an exception. We should show an dialog here.
bug:11258139
Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 36ebcb11b15fb00d3a641499c0f8a16745a2fbb0 |
|
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix the mapping between preview UI and camera sensor
Bug: 11409659
Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d053a5b2aa8cd9cb09bd40962b305ef34e7d404b |
|
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
Update aspect ratio when preview aspect ratio changes
Bug: 11250125
Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8470cae9049959ee6bb28cde1c53185f2ffd10a1 |
|
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
|
| 367c7c82a22ec007771059beec4aeff3ef96310e |
|
16-Oct-2013 |
ztenghui <ztenghui@google.com> |
Send an message to decouple the gcam module change.
In this particular case, we try to enter GCam module directly which cause the
mCameraDevice to become null for photo module.
Therefore we post a message to switch into GCam to make sure current mode
switch complete first.
bug:11252237
Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 3a45c33d74fe0ad0ade9be3d037560a53891c627 |
|
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
Show a preview cover until real preview is ready
Bug: 11211650
Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 3044d8c577432d6e9721fc8b26ac2afbbaf21266 |
|
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Set camera controls visibility based on whether the camera preview is centered.
Bug: 10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f06221914bf40b6345cacd1a5904d773c6eddcb0 |
|
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
|
| d748827206f4fd065b7f083f521c7bb9a78f85a3 |
|
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Allow debugging postcapture image to be added to mediastore.
Bug: 11010544
Change-Id: Iaa5a2d8bcc3ece583376517e006018b0c8b75587
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2a959b838d9a20830d15f916a8a698f18582da5c |
|
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbad
|
| 330dafba33f0d75929591095028779f068459431 |
|
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't initialize photo module if it's paused.
Bug: 11028614
The main visible issue with this is that we register additional
location listeners, thus draining battery as we don't unregister
them ever.
Change-Id: Ibd39171681867a12bc00abe9705f4281b9945ec1
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 59390061e26d3d481c6e0c9b22fb3ee8ec8387b0 |
|
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
Remove display change listener for mode switch
Bug: 10928549
Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d217ed0fa931d2a080a159c24e4012697baf5ae3 |
|
09-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Add postcapture for gcam debugging.
Bug: 11010544
Change-Id: I782bf3bd52f7b37cf47291501560ba771951760a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0fb819b4619cd4ac20f9d381739e444da011d4ed |
|
08-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't go into Gcam when it's capture intent.
bug:11115082
Change-Id: I2532e9597f526eb7daea9753b019d5ed95f5fe6b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 4de788063b51cc2d3f65122bdcc7f862170ba761 |
|
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Revert CL that added broadcast receivers for shutter control.
Bug: 11006189
This was added for Gem support but causes us trouble. As it's not
essential, we'll remove it now.
Original CL was http://ag/342589
Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 238799e97077ee72a53a5a04d9d3068aebb82bf7 |
|
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
|
| 9bf0fd606a624138b8c1123d168f06a24c4d20a3 |
|
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Change icons and code from HQ to HDR+ mode.
Bug: 11047147
Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| cbdd373181fdd389f02e71a8079e9aab5f11fbad |
|
03-Oct-2013 |
Doris Liu <tianliu@google.com> |
Leave ROI not set except in tap-to-focus scenario
Bug: 11005574
Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2396e609321f38be61151dd6530d8fd0b0dc2f63 |
|
27-Sep-2013 |
Angus Kong <shkong@google.com> |
Restore HQ preference in GCam module.
bug:10860305
Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 667880948de7a051f62359878cb61c1e0a867e24 |
|
26-Sep-2013 |
Seth Raphael <magicseth@google.com> |
Remove PopupManager to remove a memory leak
PopupManager had been previously refactored out
but vestiges remained. They were causing a memory
leak of Activities in its hash map.
Bug: 10728773
Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c9c1504408819bda3fb6b2b264f9dbf6012f9b7f |
|
25-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
|
| 2dcc0a9dfcc23f090bbe36308f92d72f68c4f0a2 |
|
25-Sep-2013 |
Angus Kong <shkong@google.com> |
Checks for low storage in wide-angle pano mode.
1. Storage.LOW_STORAGE_THRESHOLD -> Storage.LOW_STORAGE_THRESHOLD_BYTE.
2. Checks for low storage before start preview in wide-angle pano mode.
3. Add low storage warning message for debugging when in wide-angle pano mode.
bug:10691367
Change-Id: Iffd96d322b33591c8f235fcf5680e86cf0f06571
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0537d4f7abe9e137f626e5cff3fcf252bb04c626 |
|
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
|
| b3749f2071f866c43ea5f70de219f23157097077 |
|
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
Increase ROI size to 1/8 of the image width
Bug: 10863323
Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| be7dc6279dfe17cb93fab8cf88d1115966acb2e0 |
|
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix HQ mode change to allow return to regular photo mode.
Bug: 10848559
Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 98f38bb04daa3db49a072718cd8b5005b8b73af1 |
|
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add HQ option and use it to switch to GCam.
Bug: 10430748
Bug: 10785988
Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 4601f5d987ad2f57db6b1b65a716f00308e5ae99 |
|
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Enable gcam as HDR pie menu option.
Bug: 10430748
Change-Id: I0f589126bac895b31ef7475afd093680766de39e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 16a35206473b5a49821edccea93bbde54c52be49 |
|
23-Sep-2013 |
ztenghui <ztenghui@google.com> |
Sort and select the preview fps range for still image.
bug:10842868
Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a9d66bdab247626b31dc182c4d62520b3abffdbd |
|
06-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Adding gcam module to Camera2 app.
Bug: 10430748
Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 638e6f06c877d90b907f66ea9c22b3c6b73c7384 |
|
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up ApiHelper and remove unused code paths.
Bug: 10821545
As we're targeting ICS there are a lot of checks and code paths
that are no longer in use. This CL cleans them up.
Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 4f795b878843e59810ec1dca05b7cdb37b5614c5 |
|
16-Sep-2013 |
Angus Kong <shkong@google.com> |
Show dialog when camera device is not connected.
bug:10726516
Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 36e56fba281292255a01ee00b4bee067fa09ab59 |
|
12-Sep-2013 |
Doris Liu <tianliu@google.com> |
Show captured image rather than frozen preview for capture intent
Bug: 10570887
Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e |
|
09-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix the flash mode transition in video mode
onSwitchMode is wrongly overloaded, now is fixed.
Basically, onCurrentDataChanged will handle the switching in and out of Camera.
onDataFullScreenChange will handle full screen change on non-preview data.
bug:10610967
Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f3d3a5c63bd0d88882f0180ac79186c03c644c70 |
|
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
|
| 8890194726507573fd230fba7d4042ed00b363e4 |
|
29-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Disable shutter button while picture is being taken.
Bug: 7328018
Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0df03318d36f77aaec11238854921bd45f50c035 |
|
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
|
| 29da2db13029f8896018836693139a05d1139362 |
|
28-Aug-2013 |
Doris Liu <tianliu@google.com> |
Flip capture thumb when using front facing camera
Bug: 10495008
Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| a16e7b50f3148f581439509279f242092e254309 |
|
23-Aug-2013 |
ztenghui <ztenghui@google.com> |
Add rotate support in Film Strip
Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.
bug:10367037
Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0acda98704a01e20de5af8026875789af1cd56f9 |
|
28-Aug-2013 |
Tenghui Zhu <ztenghui@google.com> |
Revert "Add rotate support in Film Strip"
This reverts commit 568ad02f9fd3993abf4b973bdd49a34737267c77.
Change-Id: I300376126b55191e4112b8aabf3f9f61cc27fef6
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 568ad02f9fd3993abf4b973bdd49a34737267c77 |
|
23-Aug-2013 |
ztenghui <ztenghui@google.com> |
Add rotate support in Film Strip
Move the exif related code under src.com.android.camera.exif.
Refactor the member variables under LocalMediaData.java.
Refactor the LocalData to make sure they are immutables for thread safety.
bug:10367037
Change-Id: I0b8128a806fa9e777a87967b294555daadced1c5
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ce2acbcb77225b6d429a23e00f69aadde8c2378b |
|
22-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix preview thumb orientation
Bug: 10428123
Change-Id: I7c6f37db66d9e10a07f555902b214009156736c1
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| fca1c5ece5450914ed49115443e1d45737f2ee40 |
|
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
Defining broadcast intent strings as constants in CameraUtil.java.
For now I'm leaving the definition within the Camera application. If
we decide we want to publicize and document these intents as part of
the Android API, we could move the definitions to Camera.java.
Change-Id: Ia198b843245b70d7378e1ea81ecb8b7983486446
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 92ae10ec320405d07c85a9e80be40293c65d85e0 |
|
13-Aug-2013 |
Dan Aminzade <monzy@google.com> |
Add support for remote shutter control via broadcast intents.
Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to
notify Gem to hide and show the camera card, and receive the SHUTTER
broadcast intent to trigger the shutter.
This change resolves b/10185077.
Change-Id: I1e38039874b74460f5c815e9d2672789691e9e2f
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| dcccc510652b835fdbd39310a07849af8203052a |
|
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix camera preview stopped after onResume().
This fix is for the blank camera preview blank after onPause() -> onResume().
1. Refined camera start up procedure by removing redundant camera startup
thread.
2. Cleanup unused calls after aparted from gallery.
bug:10189998
Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ddef7798808fb8871650a5a803aec1f169a08bcb |
|
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused code.
Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b50b5cbfbc0a67db6fc43373363b10381c9c61a3 |
|
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Clean up Gallery codes.
bug:10263696
Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c3679c0961521165499380c77344acc69072b2ac |
|
09-Aug-2013 |
Doris Liu <tianliu@google.com> |
Use PopupWindow for settings popup
Bug:10261902
Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 37f3611bbdc787c996a99894dcef7d8fb77e3f7c |
|
06-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
This adds the following four CLs to Camera2:
http://ag/339319
http://ag/338974
http://ag/338401
http://ag/324149
Adapted to work in Camera2 and adding a .gitignore so that temporary
Eclipse files and folders are not submitted.
Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8e963a5a6016d246184ed65906f9d103e92b17e2 |
|
06-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
This removes all non-Camera stuff from Camera2.
Note: Camera2 is a clone of Gallery2 right now.
Note 2: I will bring .mk files back later.
Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 9e76552adff6ecf8b8e4070ecd61699cb6d18269 |
|
31-Jul-2013 |
Angus Kong <shkong@google.com> |
Add wrapper for face detection listener.
bug:10113532
Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 9ef9925131835743f5316393758c14532c06277d |
|
19-Jul-2013 |
Angus Kong <shkong@google.com> |
Refactor CameraManager.
1. CameraManager should be the only class accessing android.hardware.Camera.
2. For potential future upgrade in Camera HAL and android.hardward.Camera API
upgrade, CameraManager should be just an interface instead of concrete
implementation.
3. waitDone() in CameraProxy is removed.
4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are
wrapped by our own interfaces.
Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6a8e8a1a0f3e8e62cd350733e275047475380d6b |
|
19-Jul-2013 |
Angus Kong <shkong@google.com> |
Remove legacy code ActivityBase.java.
Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6a83d528b09c55ade6ad44b82c81d4476ac57441 |
|
02-Jul-2013 |
Doris Liu <tianliu@google.com> |
Add in carlsbad: Avoid duplicated location popups
Bug: 9505556
Change-Id: I00859d8d851ea3c75d3bda4fcf5df373f06c2ee0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| c2e9abdcb39a9b8070889ff7a7d829b3eda0c51b |
|
19-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add flash animation to photo module
Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6432cd65159731a28d9239426b0f0f4d7c44fa98 |
|
14-Jun-2013 |
Doris Liu <tianliu@google.com> |
Switch over to use new camera activity
Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 44ab147ed213bf6a1aa6c62e08c20d7fca03503d |
|
08-Jun-2013 |
Doris Liu <tianliu@google.com> |
Update camera orientation when device is flipped
Bug: 8963053
Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 9d6561494d28e8e8c6f1add50ab7724df722525b |
|
30-May-2013 |
Michael Kolb <kolby@google.com> |
am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
* commit 'af65d7ba216eba60651d11d248d20346309375ed':
Add HTC One picture resolutions
|
| 4a4d4ef24b7edbbdf1614373880681e5406df246 |
|
30-May-2013 |
Michael Kolb <kolby@google.com> |
Add HTC One picture resolutions
Bug: 9175168
Fixes bug where preview is not stopped before size changes
Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 88741b480f3dece25ac06a87d3752e995bdd53c5 |
|
28-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unused handling for intent extras in editor.
Bug: 9170644
Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 78a5b224eca3c702f4ecf8abd072779e32e26641 |
|
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update capture animation
Bug: 8253060
Update preview thumb margins and size
Add touch target for thumbnail
Change-Id: I2b298de330834c42a55b4cb082148d971727f530
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| eb8adc1754fc668435ee57d1be2235b80fc8c009 |
|
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add new indicators
Bug: 8640131
Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 9cdfe00cf57f05f81e6d02ca050e6afd8cc4a25f |
|
16-Apr-2013 |
Doris Liu <tianliu@google.com> |
Allow swiping to filmstrip from blocker bar
Bug: 8607910
Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 36ed867759d089723fc40947d772bb21deba5096 |
|
15-Apr-2013 |
Angus Kong <shkong@google.com> |
Use extra copy of parameters for concurrent access
bug:8585306
Change-Id: I21b8915c53508e4820e46b49171149189cb6012e
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 28dc7f348b70ee6735d208b48ca12a94e9cd222f |
|
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix camera preview being squished
Bug: 8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 1a664450bed2737660057def2d25b0c6b49b3ba8 |
|
05-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Moving crop to a separate activity. Refactoring.
Bug: 8526929
Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 301b64679cfbd452060ac5b9595d315135550120 |
|
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics for photo and video capture
Bug: 8433834
Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 2a23c46ca52e9af02aac7c454a89d2b9c4f2e539 |
|
27-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
|
| dcb0ef1d6eacdd7d18a6881ae75f67c9851a858c |
|
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera calls asynchronous
bug:8438047
Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 81c9d5d383e366670cb88c3a16a457428cdc18dd |
|
27-Mar-2013 |
Angus Kong <shkong@google.com> |
Remove debug log.
Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0d00a8907096b9970ac64f52abbd2bfc1ed751b6 |
|
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Add GPSDirection tag using ExifInterface.
bug:8115825
Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 0a7dd573732a06879b35cdd07a8c0ee08b62a32e |
|
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics collection for camera module, filmstrip
Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| d6954f337e20365fc24ecffdd6f30e17c6b31eff |
|
09-Mar-2013 |
Michael Kolb <kolby@google.com> |
Spring cleaning
Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 09106a41ee6acc6b20553662cb9b730702a8f08a |
|
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Add a black bar symmetric to nav bar
Also fix bug: 8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 48239f4dd39040a9ab2ffc977586035a8784fd78 |
|
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Keep camera controls on the same physical side
Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 6a0de79a7066d4ae5cc4677f88989abd15e892ff |
|
26-Feb-2013 |
Doris Liu <tianliu@google.com> |
Flatten view hierarchy and rotate views
TODO: SRI pano and Lightcycle can use a bit more flattening.
I will get to them next. (Maybe in a different CL.)
TODO: Need to cancel capture animation in onConfigurationChanged()
Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| b8cf250c6351cd96f069fd16087db5e7b0f6b1d6 |
|
22-Feb-2013 |
Doris Liu <tianliu@google.com> |
Release surface texture to fix gray camera preview
Bug: 8133672
Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| f7159e15dd704e9501a3538cb05498f40a30f042 |
|
16-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
|
| 3cf565c4242a9deab7da5eb84fc302c79d594f11 |
|
15-Feb-2013 |
Doris Liu <tianliu@google.com> |
Make photo orientation consistent with UI
Also fixed the wrong animation orientation.
Bug: 7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ad16c6799d559d304bb8688e37a02d2d9bc53a42 |
|
16-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
|
| 54987e8d3af88214ce4f3aed0b5c4e9ded5b1392 |
|
16-Feb-2013 |
John Reck <jreck@google.com> |
Remove com.android.camera.R
Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| da50e05c6f01a8de71e6c3e7293058b4f6985316 |
|
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Lock focus during countdown
Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 86d36313d88fe96354f2cdd4f378e5ff8397c458 |
|
01-Feb-2013 |
Angus Kong <shkong@google.com> |
Make video snapshot save images in the background.
bug:8114662
Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| ce5480e099fda944b9e96e4b750300944c3f4a4f |
|
30-Jan-2013 |
Angus Kong <shkong@google.com> |
Make background media saving a service
bug:8091328
Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|
| 8872c23e739de38d74f04a8c852ebb5199c905f6 |
|
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Move Camera Java/Native source into Gallery2
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
/packages/apps/Camera2/src/com/android/camera/PhotoModule.java
|