OSDN Git Service
Senpo Hu [Tue, 16 Dec 2014 19:56:39 +0000 (11:56 -0800)]
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
Paul Rohde [Thu, 18 Dec 2014 19:45:34 +0000 (11:45 -0800)]
Delete unused code.
Change-Id: I55e6da712199cb106781bea8a51cf98fd5ed7e31
Paul Rohde [Thu, 18 Dec 2014 18:21:19 +0000 (18:21 +0000)]
Merge "Refactor Photo and Video Data into seperate classes Delete unused RotationTask" into ub-camera-haleakala
Paul Rohde [Thu, 18 Dec 2014 00:21:22 +0000 (16:21 -0800)]
Refactor Photo and Video Data into seperate classes
Delete unused RotationTask
Change-Id: I9c21d712546d7e8fae81704ac6e79314b4749be0
I-Jong Lin [Thu, 18 Dec 2014 00:36:37 +0000 (00:36 +0000)]
Merge "Second Pass at Integration of ImageBackend" into ub-camera-haleakala
I-Jong Lin [Fri, 12 Dec 2014 00:46:49 +0000 (16:46 -0800)]
Second Pass at Integration of ImageBackend
Implementation of single service to centralize task submission and
execution of Android Image dependent tasks to minimize the locking
of system resources and to prioritize processing with thread
priority and enforced temporal dependence. This implementation
is ready to support the plumbing for Lucky Shot. Currently, the
object are isolated and not wired into the Camera App itself.
The integration of these objects will occur in a subsequent CL.
The unit tests for these object are contained in a separate,
but related CL: ag/602679 .
Change-Id: Ia51d46651ed02ea2d5a014943d17cadb56e9006f
Paul Rohde [Fri, 5 Dec 2014 20:17:15 +0000 (12:17 -0800)]
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
Sascha Haeberling [Wed, 17 Dec 2014 01:43:21 +0000 (01:43 +0000)]
Merge "Adding stack support and hooking SmartBurst up to the new API." into ub-camera-haleakala
Sascha Haeberling [Mon, 8 Dec 2014 23:32:34 +0000 (15:32 -0800)]
Adding stack support and hooking SmartBurst up to the new API.
Change-Id: Icc023aed65e1e31f0b808de648067b3628fff838
Senpo Hu [Tue, 16 Dec 2014 19:59:49 +0000 (19:59 +0000)]
Merge "Bug fixes for capture indicator UI." into ub-camera-haleakala
Radford Juang [Mon, 8 Dec 2014 22:39:52 +0000 (14:39 -0800)]
Setting AF mode for SmartBurst to CONTINUOUS_VIDEO to prevent focus
issues when capturing action with SmartBurst.
(Note: b/
16984793 prevents this from working properly on Nexus 5)
Change-Id: I3b046030ccf1264a339fa1e8dc15ae92d7157e7f
Sascha Haeberling [Thu, 11 Dec 2014 22:15:04 +0000 (14:15 -0800)]
Make sure to only silence if the mediarecorder was started.
Bug:
11538882
Change-Id: I43991b40fb9312cc59b34132457b5e6b201a8c19
Senpo Hu [Thu, 11 Dec 2014 00:39:23 +0000 (16:39 -0800)]
Bug fixes for capture indicator UI.
* Don't show capture indicator in Photo Sphere.
* Fix the layout on Nexus 6.
* Don't transform thumbnail image if the size is matched.
Change-Id: I03c9c09071b63ed8143236a242b6435b4ea19018
Sascha Haeberling [Thu, 11 Dec 2014 22:04:59 +0000 (22:04 +0000)]
Merge "Disable systems sounds and vibrations during video recording." into ub-camera-haleakala
Sascha Haeberling [Thu, 11 Dec 2014 20:20:43 +0000 (12:20 -0800)]
Disable systems sounds and vibrations during video recording.
Bug:
11538882
Change-Id: If06bdc33ee68d079b581a2e97879dae5c34492fd
Puneet Lall [Wed, 10 Dec 2014 21:14:52 +0000 (21:14 +0000)]
Merge "Initial frameserver/OneCamera integration" into ub-camera-haleakala
Senpo Hu [Wed, 10 Dec 2014 20:08:54 +0000 (20:08 +0000)]
Merge "New capture indicator design for Haleakala." into ub-camera-haleakala
Senpo Hu [Thu, 20 Nov 2014 01:11:46 +0000 (17:11 -0800)]
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
Sascha Haeberling [Tue, 9 Dec 2014 22:57:59 +0000 (22:57 +0000)]
Merge "Clean up unused CameraPreviewData." into ub-camera-haleakala
Sascha Haeberling [Tue, 9 Dec 2014 22:51:22 +0000 (22:51 +0000)]
Merge "Remove unused SoundClips class." into ub-camera-haleakala
Sascha Haeberling [Tue, 9 Dec 2014 22:41:19 +0000 (22:41 +0000)]
Merge "Remove unused sound files." into ub-camera-haleakala
Alan Newberger [Tue, 9 Dec 2014 22:17:07 +0000 (22:17 +0000)]
am
a8923a75: Avoid resetting touch to focus in onPreviewStarted for N4
* commit '
a8923a75b4c1ffa2158687221fd679b2dea60013':
Avoid resetting touch to focus in onPreviewStarted for N4
Alan Newberger [Tue, 9 Dec 2014 19:28:45 +0000 (11:28 -0800)]
Avoid resetting touch to focus in onPreviewStarted for N4
N4 HAL stability issues seem to be exacerbated by resetting focus
in onPreviewStarted. Removing this call yields OK performance for
N4 and removes any repros for the known issue.
Bug:
18681082
Change-Id: I7f78ad648ff55dee412abb18560276cba99ab988
Sascha Haeberling [Tue, 9 Dec 2014 18:33:01 +0000 (10:33 -0800)]
Remove unused SoundClips class.
Change-Id: I71e5cedb8e70d33172fc0c48fcf3bebfd6e35f88
Sascha Haeberling [Tue, 9 Dec 2014 18:29:27 +0000 (10:29 -0800)]
Remove unused sound files.
Change-Id: I60898c83c0087696a448cefb1e608525c1bd13a2
Puneet Lall [Tue, 2 Dec 2014 21:12:53 +0000 (13:12 -0800)]
Initial frameserver/OneCamera integration
Change-Id: I2fe0d8acf9ce927a6a0a1dea599299c715503462
Shashi Shekhar [Fri, 5 Dec 2014 23:54:00 +0000 (23:54 +0000)]
Merge "Fix orientation for preview frames in burst." into ub-camera-haleakala
Shashi Shekhar [Thu, 4 Dec 2014 20:05:18 +0000 (12:05 -0800)]
Fix orientation for preview frames in burst.
Fix orientation of preview frames in burst. Set the correct orientation
when starting the burst.
BUG:
18117847
Change-Id: I4ed2f0387a5a35a5f43f0528d179b273828ea699
Sascha Haeberling [Fri, 5 Dec 2014 22:57:08 +0000 (14:57 -0800)]
Clean up unused CameraPreviewData.
Change-Id: I86d60a553d84e0f625fa596c1029394ff110c5d0
Shashi Shekhar [Thu, 4 Dec 2014 23:38:18 +0000 (15:38 -0800)]
Fix some timestamp issues with burst.
1. Set timezone to UTC, as the timestamp is in UTC.
2. Use timestamp from mediaItem.getTimestamp()
3. Change the format of filename to include artifact as well as
mediaitem index.
BUG:
18625548
Change-Id: I91196fefda780c3a262619e97c6684086adf845d
Alan Newberger [Thu, 4 Dec 2014 19:13:13 +0000 (19:13 +0000)]
Merge "When checking for scene mode, use NO_SCENE_MODE in addition to AUTO" into ub-camera-haleakala
Alan Newberger [Thu, 4 Dec 2014 18:46:49 +0000 (10:46 -0800)]
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
Senpo Hu [Thu, 4 Dec 2014 18:56:57 +0000 (18:56 +0000)]
Merge "Fix the orientation issue for front camera." into ub-camera-haleakala
Senpo Hu [Tue, 2 Dec 2014 22:52:23 +0000 (14:52 -0800)]
Fix the orientation issue for front camera.
This bug is introduced by the refactoring done in ag/589395.
Bug:
18520267
Change-Id: If0df6a7d6fe3ca630839ef92dccaa78f0136bb7d
Sam Hasinoff [Thu, 27 Nov 2014 19:04:09 +0000 (11:04 -0800)]
Add support to dump LensShadingMap metadata, related cleanup
- Add custom toString() for LensShadingMap to workaround
b/
16899576.
- Remove several now-unneeded custom toString() methods,
since lmp-release provides them in:
frameworks/base/core/java/android/hardware/camera2/params/
- Picky formatting fix.
Bug:
16899576
Change-Id: Iebf0b03ea27f291bc0f633b3760d5bd696df906d
Shashi Shekhar [Thu, 27 Nov 2014 01:55:52 +0000 (17:55 -0800)]
Bump memory limit for saving images.
Bump the memory limit for saving images in MediaSaver from 20 to 30 MB.
Allows bursts to be saved without hitting memory limit issues.
Change-Id: I5795cd1b2870a9a4e48738fe5d60c1b819011d23
Sascha Haeberling [Wed, 26 Nov 2014 21:09:24 +0000 (13:09 -0800)]
Make sure we only show the toast when burst was actually stopped.
Change-Id: I057bd7217d09f4754584f77c3911749d2ac0fa5f
Sascha Haeberling [Tue, 25 Nov 2014 23:30:34 +0000 (15:30 -0800)]
Add a temporary toast message decorator so users know when a burst is on.
Change-Id: If6164f636f60de6f7303a5d54f432648a25e012a
Puneet Lall [Tue, 25 Nov 2014 23:01:06 +0000 (23:01 +0000)]
Merge "Move async package to com.android.camera" into ub-camera-haleakala
Puneet Lall [Tue, 25 Nov 2014 22:57:58 +0000 (14:57 -0800)]
Move async package to com.android.camera
Change-Id: I937dbdc07fde9fa134f169538243e8c5ee1b6a46
Alan Newberger [Tue, 25 Nov 2014 22:46:37 +0000 (22:46 +0000)]
Merge "Separate enable/disable and show/hide logic in ButtonManager" into ub-camera-haleakala
Puneet Lall [Tue, 25 Nov 2014 19:27:53 +0000 (11:27 -0800)]
Refactor OneCamera
* Removed CaptureParameter "sanityCheck"
* Removed unused OneCamera interface methods
Change-Id: I2464cedf4ad9122e6ca72055e1cc8c0ba633a164
Alan Newberger [Tue, 25 Nov 2014 01:11:55 +0000 (17:11 -0800)]
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
Puneet Lall [Mon, 24 Nov 2014 18:50:43 +0000 (18:50 +0000)]
Merge "Initial Frameserver Implementation" into ub-camera-haleakala
Puneet Lall [Fri, 31 Oct 2014 22:13:16 +0000 (15:13 -0700)]
Initial Frameserver Implementation
Change-Id: Ia683adb31136030b98e7ec429163987ae32da0c2
Alan Newberger [Thu, 20 Nov 2014 18:47:30 +0000 (18:47 +0000)]
am
fdefc726: Add renderscript helper value
* commit '
fdefc72616d55de5f4e13a3e60fb9561cc8488cb':
Add renderscript helper value
Alan Newberger [Thu, 20 Nov 2014 18:03:52 +0000 (10:03 -0800)]
Add renderscript helper value
Capture new architecture/API-level constraints on renderscript in
the ApiHelper.
Bug:
18435492
Change-Id: I4d06a0c8448cde587f8a9cb3a042768a4a61872a
Shashi Shekhar [Thu, 20 Nov 2014 02:39:42 +0000 (02:39 +0000)]
Merge "Hook burst controller to the shutter button long press." into ub-camera-haleakala
Senpo Hu [Thu, 20 Nov 2014 02:04:47 +0000 (18:04 -0800)]
Remove the old unit tests.
Change-Id: Ia08785e21f27c0d6f22f5533eab65d8726f52169
Shashi Shekhar [Wed, 12 Nov 2014 17:52:19 +0000 (09:52 -0800)]
Hook burst controller to the shutter button long press.
Hooks up the shutter button long press to start the burst.
Introduces a BurstManager to interact with burst.
Provides an implementation of BurstManager that listens to burst and
saves results when burst is complete.
The burst eviction handler is now installed on the ring buffer
on shutter button press and uninstalled on shutter button release.
The ring buffer is cleared before starting and after completion of the
burst.
Also provides a stub implementation of the BurstController that has a
static method which controls if burst is enabled or not.
Bug:
18332704
Change-Id: I1098937bf348af7acbf55da1a5eeb423c30fb901
Senpo Hu [Tue, 18 Nov 2014 06:56:31 +0000 (22:56 -0800)]
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
Shashi Shekhar [Wed, 19 Nov 2014 21:42:45 +0000 (21:42 +0000)]
Merge "Wrap FrameDistributor in a thread safe accessor." into ub-camera-haleakala
Shashi Shekhar [Tue, 18 Nov 2014 19:01:51 +0000 (11:01 -0800)]
Wrap FrameDistributor in a thread safe accessor.
Wrap FrameDistributo in a thread safe accessor and make the instance to
accessor a final field in CaptureModule. This should help in avoiding
null checks and NPEs.
BUG:
18414956
Change-Id: I8d25c5a2923a7382f98c523e88f7547f16217a6f
Alan Newberger [Sat, 15 Nov 2014 00:47:30 +0000 (00:47 +0000)]
Merge "Vector version of camera preview graphic." into ub-camera-haleakala
Dan Sandler [Fri, 14 Nov 2014 15:39:49 +0000 (10:39 -0500)]
Vector version of camera preview graphic.
Even less RAM required to hang onto this in the lockscreen.
Bug:
18369196
Change-Id: I7ed5ad098b77c96b40d0b76e4a20a7fea12e362a
Dan Sandler [Fri, 14 Nov 2014 15:02:13 +0000 (10:02 -0500)]
Trim transparent pixels off camera preview bitmaps.
Since SysUI holds these bitmaps in memory for jank-free
drawing, these pixels are just wasted RAM. Since the
transition code assumes uniform square bitmaps, these are
all 64x64dp, which is still a teensy bit wasteful but much
better than before (144x144dp).
Bug:
18369196
Change-Id: Idf10b2048190ac44eff3e5da467149c460067347
Shashi Shekhar [Tue, 11 Nov 2014 17:34:49 +0000 (17:34 +0000)]
Merge "Initial version of new module to distribute camera frames to consumers." into ub-camera-haleakala
Shashi Shekhar [Fri, 7 Nov 2014 02:48:26 +0000 (18:48 -0800)]
Initial version of new module to distribute camera frames to consumers.
Add FrameDistributor class, that allows passing frames from a
SurfaceTexture to multiple consumers in an efficient manner.
In the CaptureModule, this distributor is used to handle frames
coming from the Camera. It then hooks up a single FrameConsumer
to render frames into a SurfaceTexture.
Note, that this particular FrameConsumer is atypical in the sense
that it reuses the FrameDistributors GL context for efficiency.
Other consumers will typically use their own GL contexts and threads
for processing.
Bug:
18142762
Change-Id: Iee258d108004c23b7d9777204b58c013a9999215
Sascha Haeberling [Thu, 6 Nov 2014 17:50:51 +0000 (09:50 -0800)]
Add experimental RAW(DNG) support.
Bug:
18272977
This adds RAW writing behind a new debug property:
adb shell setprop persist.camera.capture_dng 1
This will switch to the non-ZSL implementation of one Camera.
The resulting files are stored in a "DNG" folder under DCIM/Camera.
Caveats:
- Preview aspect ratio will not match.
- No item in filmstrip
Change-Id: I9d990de119f22a12d37b22d36d84dc15aeee9340
Shashi Shekhar [Thu, 6 Nov 2014 22:59:25 +0000 (22:59 +0000)]
Merge "Initial interface for the burst module." into ub-camera-haleakala
Andy Huibers [Thu, 6 Nov 2014 16:57:46 +0000 (16:57 +0000)]
Merge "Center zoom UI." into ub-camera-haleakala
Shashi Shekhar [Fri, 17 Oct 2014 18:45:54 +0000 (11:45 -0700)]
Initial interface for the burst module.
Interface for the burst module.
Burst module controls the internal camera buffer and keeps images that
best represent a burst at any given point in time.
The burst module decides which frames to keep by analyzing low-res
preview frames and then keeping corresponding high-res images in the
internal camera buffer.
At the end of the burst, the burst module retrieves results from the
internal camera buffer and can do post processing on the results.
Change-Id: I09d4031ad1566232a5d4641084523c3e3e0aace6
Sascha Haeberling [Thu, 6 Nov 2014 03:34:01 +0000 (19:34 -0800)]
Poke build server, nothing to see here.
Change-Id: I3cbd26744539c2c6cf5e68ecd4c5401a003097b1
Sascha Haeberling [Wed, 5 Nov 2014 19:31:38 +0000 (19:31 +0000)]
Merge "Update project.properties to use proper SDK 21 instead of preview L." into ub-camera-haleakala
Sascha Haeberling [Wed, 5 Nov 2014 19:30:06 +0000 (11:30 -0800)]
Update project.properties to use proper SDK 21 instead of preview L.
Change-Id: I737bdfcfea80a6e722cebf50a2f1ad67542690e1
Alan Newberger [Tue, 4 Nov 2014 22:34:30 +0000 (22:34 +0000)]
am
8dd164a3: Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
* commit '
8dd164a39a43cdf1a5de5f1e178b42d471316cac':
Relax aspect ratio matching tolerance for devices with 1.347 ratios
Alan Newberger [Tue, 4 Nov 2014 22:30:39 +0000 (22:30 +0000)]
Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
Alan Newberger [Tue, 4 Nov 2014 22:21:33 +0000 (14:21 -0800)]
Relax aspect ratio matching tolerance for devices with 1.347 ratios
Our .01 tolerance omits valid 4:3 previews when the image capture is
more than 0.01 over true 4:3. Relax matching in Glacier just for
affected builds.
Bug:
18241645
Change-Id: I5868bc9535e4c9bb886f0de0daf0e83cd2f4dc78
Alan Newberger [Tue, 4 Nov 2014 19:40:21 +0000 (19:40 +0000)]
am
5a64d117: move size parameter setting before other settings
* commit '
5a64d117ceccc8572a426e7d27306d81aa5c5663':
move size parameter setting before other settings
Alan Newberger [Tue, 4 Nov 2014 06:44:14 +0000 (22:44 -0800)]
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
Sascha Haeberling [Wed, 29 Oct 2014 19:29:29 +0000 (19:29 +0000)]
am
06a4e103: Forcefully drop 4k recording from pre-L releases.
* commit '
06a4e103aefa3303a6995d465a53c81d6581995f':
Forcefully drop 4k recording from pre-L releases.
Sascha Haeberling [Wed, 29 Oct 2014 19:14:07 +0000 (12:14 -0700)]
Forcefully drop 4k recording from pre-L releases.
Bug:
18172081
Change-Id: I26b09f19757e059d3567b3cb707592696531d0b3
Sascha Haeberling [Tue, 28 Oct 2014 19:18:09 +0000 (19:18 +0000)]
am
1332fc02: Remove additional dependencies on FloatMath
* commit '
1332fc023ea9941ff4afac0a43d13930d5b59771':
Remove additional dependencies on FloatMath
Andy Huibers [Tue, 28 Oct 2014 18:42:56 +0000 (11:42 -0700)]
Center zoom UI.
Bug:
18153777
Change-Id: I27fc0d0ceb8a707214d7dda821a2d5b8c25c955b
Sascha Haeberling [Tue, 28 Oct 2014 17:18:31 +0000 (10:18 -0700)]
Remove additional dependencies on FloatMath
See frameworks/base commit
33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I70a3ad8a9264c320b5e2d6a9097a05d473e4fcfa
Sascha Haeberling [Tue, 28 Oct 2014 05:14:49 +0000 (05:14 +0000)]
am
c7beaf11: Fix wear interaction of CaptureModule
* commit '
c7beaf110667df54d7ef97cc73e0fe28e31149de':
Fix wear interaction of CaptureModule
I-Jong Lin [Tue, 28 Oct 2014 05:14:45 +0000 (05:14 +0000)]
am
e11795bf: Merge "Volantis Device Identifier Helper" into ub-camera-glacier
* commit '
e11795bf44b2c0e5668c7ef6660cffb94b690a9b':
Volantis Device Identifier Helper
Spike Sprague [Tue, 28 Oct 2014 05:14:44 +0000 (05:14 +0000)]
am
775b6e6d: Merge "consistent style for titles on user education screens" into ub-camera-glacier
* commit '
775b6e6d8adab73fcae820c6600b173b258d5162':
consistent style for titles on user education screens
Spike Sprague [Tue, 28 Oct 2014 05:14:43 +0000 (05:14 +0000)]
am
7d7d12b2: Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
* commit '
7d7d12b23cb246c5aa8ebf03a98d189d5b6e0f30':
Prevent unnecessary setVisibility calls in Filmstrip while zooming
Alan Newberger [Tue, 28 Oct 2014 05:14:43 +0000 (05:14 +0000)]
am
8644ffce: Align id selection from QueryTask to sort order from Media query
* commit '
8644ffceaa0968cb3c4e8736d37ef1683aa30977':
Align id selection from QueryTask to sort order from Media query
Sascha Haeberling [Tue, 28 Oct 2014 00:53:12 +0000 (17:53 -0700)]
Fix wear interaction of CaptureModule
Bug:
18121865
- Make sure we announce that the module is exiting.
- Send postview image to wear device.
- Make sure we can take a picture when timer is on.
Change-Id: I1cbc2e9a1725fdd6d8724ce93f547c87eab8b4aa
I-Jong Lin [Mon, 27 Oct 2014 23:17:19 +0000 (23:17 +0000)]
Merge "Volantis Device Identifier Helper" into ub-camera-glacier
I-Jong Lin [Mon, 27 Oct 2014 22:38:32 +0000 (15:38 -0700)]
Volantis Device Identifier Helper
Bug:
17868158
Part of a multi-project commit, along with ag/575889
Adds a helper function to identify when the Android device
is a Nexus 9.
Change-Id: I36c3b6e4472d08d1be7b1197fd62f4766fcc81ed
Spike Sprague [Mon, 27 Oct 2014 21:21:30 +0000 (21:21 +0000)]
Merge "consistent style for titles on user education screens" into ub-camera-glacier
Spike Sprague [Mon, 27 Oct 2014 21:07:14 +0000 (21:07 +0000)]
Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
Spike Sprague [Mon, 27 Oct 2014 18:58:42 +0000 (11:58 -0700)]
Prevent unnecessary setVisibility calls in Filmstrip while zooming
bug:
18122644
Change-Id: I2681e5f104527553c4f6d71d96c0b659685813fa
Alan Newberger [Mon, 27 Oct 2014 18:29:34 +0000 (11:29 -0700)]
Align id selection from QueryTask to sort order from Media query
In QueryTask we pick the id from the first result and consider it
the max id, yet we query ordered by date taken. On most phones
they're the same but by correcting the query to satisfy the
assumption in QueryTask, we remove costly scenarios where most
photos are reprocessed in LoadNewPhotosTask. One line fix in
LocalMediaData with more verbose logging added in CameraDataAdapter.
Bug:
17437217
Change-Id: Ia643f38d1bfb77ff0beaba989f0effe9a4dec31c
Spike Sprague [Fri, 24 Oct 2014 18:32:06 +0000 (11:32 -0700)]
consistent style for titles on user education screens
bug:
18115448
Change-Id: I9d1caaa0903d6f3c2c47ca3e8457a4f85aad910c
Spike Sprague [Fri, 24 Oct 2014 01:11:28 +0000 (01:11 +0000)]
am
f4857ffa: Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier
* commit '
f4857ffa50a4fe6fcead0abde524376c0e9d6a5a':
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
Sascha Haeberling [Fri, 24 Oct 2014 01:08:37 +0000 (18:08 -0700)]
Merge commit '
770c2b3e' into stuff1
Conflicts:
src/com/android/camera/data/LocalSessionData.java
Change-Id: Id7113ce6ba3b95ac78511dbbb8391b3bf2a17ecd
Alan Newberger [Fri, 24 Oct 2014 01:03:49 +0000 (01:03 +0000)]
am
47e9f17a: Merge "Clean up orientation logging" into ub-camera-glacier
* commit '
47e9f17a13b391554c8121aae049e91b553688cf':
Clean up orientation logging
Spike Sprague [Fri, 24 Oct 2014 00:59:45 +0000 (00:59 +0000)]
Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier
Sascha Haeberling [Fri, 24 Oct 2014 00:28:37 +0000 (17:28 -0700)]
Introduce ActionCallback for LocalData items.
Bug:
18105354
Fixes the bug where we try to cast a context to an activity.
Change-Id: I3e82a2cda5fe004768276a4d48c07d75738b2a5e
Spike Sprague [Thu, 23 Oct 2014 23:35:09 +0000 (16:35 -0700)]
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
bug:
18104680
Change-Id: Ifd56369ca8177d40317f6af76bbc55a2110d6f5c
Spike Sprague [Thu, 23 Oct 2014 17:25:45 +0000 (17:25 +0000)]
am
1c758c88: Merge "new colors for GAR contrast compliance" into ub-camera-glacier
* commit '
1c758c88d5f69b613da4e50d7a06e28804993170':
new colors for GAR contrast compliance
Sascha Haeberling [Thu, 23 Oct 2014 17:24:23 +0000 (10:24 -0700)]
Merge commit '
5aad0cb4' into stuff1
Conflicts:
src/com/android/camera/CameraActivity.java
src/com/android/camera/one/OneCameraManager.java
Change-Id: I9495daa600356ffcef21bba506dc5a3fce365af3
Alan Newberger [Thu, 23 Oct 2014 17:13:30 +0000 (17:13 +0000)]
am
f7a18c7f: Merge "Null check for buildItemFromData" into ub-camera-glacier
* commit '
f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d':
Null check for buildItemFromData
Alan Newberger [Thu, 23 Oct 2014 17:13:30 +0000 (17:13 +0000)]
am
f4084e35: Check for null when deleting preference groups
* commit '
f4084e35eac8a8b86e807573647d4a7b43852a59':
Check for null when deleting preference groups
Alan Newberger [Thu, 23 Oct 2014 17:02:09 +0000 (17:02 +0000)]
am
05edd2ee: Increase VERBOSE logging for PhotoModule orientation use
* commit '
05edd2eec40d2a3ce7a76dc9f4d7dfe65e576ab7':
Increase VERBOSE logging for PhotoModule orientation use
I-Jong Lin [Thu, 23 Oct 2014 17:02:09 +0000 (17:02 +0000)]
am
b20cf71a: Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier
* commit '
b20cf71a817e1835a5ea8d084c9896c2aae706d9':
Secure Camera App survives phone unlock screen