| Commit message (Collapse) | Author | Age | Files | Lines |
| ... | |
| | | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 11211650
Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
|
| |\ \ \ \
| |/ / /
|/| | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Earlier, when a machine shot is triggered,
because camera in focusing mode, we were
just exiting without taking longshot.
This change fixes it.
Change-Id: Ic21480fbcb5d46cddfb837e67e108709db5c0d55
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- AF(for instance touch AF) could be started
during ZSL mode. Currently the application
will not wait for AF callback to come before
proceeding with the snapshot. This depending
on timing will lead to inconsistent camera
application state where an AF callback could
arrive during image capture and override the
current state machine allowing the client to
trigger capture again. The second capture
will fail causing an exception.
- This patch will not let the camera application
trigger snapshot when AF is still running
during ZSL. Additionally it will unlock CAF
after capture is done through a call to
'cancelAutoFocus()'.
Change-Id: Id5ae8ff0b7c1576ac7c6221f09837929aefcea17
CRs-Fixed: 572996, 564453
|
| |\ \ \ \ \ |
|
| | | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
While capturing image state of face detection start variable was
set to false. This is because in normal capture mode, preview will
be restarted after image capture during which face detection will
be started again. In case of zsl mode, variable state was set to
false though preview is not restarted. So when user uncheck face
detection option, control was returning without clearing face data.
This check makes sure the state is updated only in non ZSL mode.
Change-Id: I66ad64d17011a25f0d02e77334392f5d3b0abd77
CRs-Fixed: 566252
|
| |\ \ \ \ \
| |/ / / /
|/| | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If user is not in full screen camera preview mode, pressing back
key will take user to full screen preview mode. During this all
views on filstrip are reloaded and shifted to full screen preview.
While reloading preview aspect ratio was not considered so user
could see stretch preview in case of front camera. This change
calls resize of preview as per aspect ratio after reload.
Change-Id: I3dc8db3cc9917f9db33f5101f6c39cf38b950264
CRs-Fixed: 568855
|
| |\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In case of zsl mode face detection last callback is received
in 40 to 50ms after calling stop face detection on camera
device. This may be because of multi channel operation in zsl.
Because of this behavior though camera application clears the
UI immediately after stop face detection, invalid circles
remain on screen. This fix delays clearing of face circles
by 100ms.
Change-Id: I1ca10e82fff038ba720910a4cf022876dca050e1
Crs-Fixed: 566252
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
After taking snapshot focus ROI were not reseting.
This change will help to reset the ROI.
Change-Id: Ie1269faadde7829bd11c39dd8a56188bbe2ee479
CRs-Fixed: 566265
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- The longshot/burst pipeline mode uses an
optimized path for triggering 'takePicture()'
on each shutter callback. This should improve
the shot-2-shot time. In addition to this
there is also support for jpeg callbacks
that only contain a jpeg file path. The
callback in this case will only move the
file stored by the lower layers in the
correct directory.
- The longshot burst pipeline can be enabled
via this property:
"persist.camera.longshot.enable"<-"0/1"
- This change will allow longshot mode to
be triggered in non-zsl mode as well.
(Cherry picked from: I693366a7d06d3b386a8d96f86ee9a0574749c50b)
(Cherry picked from: Id630b2033f18d1c04a636597e910e695a8692ac8)
Change-Id: Idda8d58fc6d889128c1812c9c5ddadca3993c246
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix compilation issues
Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21
(cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4)
(cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 08dcf9cda27328dffab9921b42cb13b6f8d5a770
Reverted the above commit because updating skintone seek bar all the
time caused issues during regression. The original issue is fixed in
a way that skin tone bar is dismissed in switch camera function
(where other UI controls are dismissed). Hence after opening new
camera device depending on the scene mode setting, skin tone bar
visibility will be set for the new camera.
(cherry picked from commit I61602dca23c59b6715d1e887d0199d8885330521)
Change-Id: If7a37b9dbb3d379f079e88ecf8e930ad1f7b82ab
CRs-Fixed: 537663
Conflicts:
src/com/android/camera/PhotoModule.java
Conflicts:
src/com/android/camera/PhotoModule.java
(cherry picked from commit 63f9d74c3abe9d0a9c5cba877665c3349554c024)
(cherry picked from commit 1640e0c12135b0b2a0b7b2440d8eaeb7f5ffe8c8)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- A "ConcurrentModificationException" is possibleduring concurrent
configuration of camera parameterswhen skin tone is updated.
To avoid this skin tone is applied through the main handler.
(cherry picked from commit I2176e615432b1a25ff439b3f105ea9e498ae8803)
Change-Id: If20c34dc70fbf6fa3fc9ddfefadd71bc9db2cffb
Conflicts:
src/com/android/camera/PhotoModule.java
Conflicts:
src/com/android/camera/PhotoModule.java
(cherry picked from commit 37c435a3b61b435ab677cc013af02c8b48d76dc9)
(cherry picked from commit 5341b096004fa59d9732651fe03ffc161bc61156)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Skin tone dialog was part of frame layout and render overlay was
drawn on top of this. So render overlay was consuming all touch
events. This change makes sure skin tone dialog receive touch events
whenever it is visible.
Change-Id: I1d01bcc101c2f9090f0f163397e86553f98b49ac
Conflicts:
res/layout/photo_module.xml
src/com/android/camera/PhotoModule.java
Conflicts:
res/layout/photo_module.xml
src/com/android/camera/PhotoModule.java
(cherry picked from commit 675a15daf9b9eef543386630dc65f3fa9dac498e)
(cherry picked from commit ac2d0ab2b068576bf1adf05e4cef96aaf4c14be3)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Stretched preview is observed in front camera due to sensor's
mount angle. So resizing the preview by considering aspect ratio
of the preview.
(cherry picked from commit Ie8a9e062782aa6caaa80ddab705c937da6b0761e)
Change-Id: I0bca9076a6dffa4c4972e6d5d0939c57569615bd
Conflicts:
src/com/android/camera/PhotoMenu.java
src/com/android/camera/PhotoModule.java
Conflicts:
src/com/android/camera/PhotoMenu.java
src/com/android/camera/PhotoModule.java
(cherry picked from commit 2960ef94825458dc07a497d4414155b57ae620d7)
(cherry picked from commit d2fbed622a486151a656261d0dd56c896f0cc700)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Swipe in preview does not route user to Gallery, hence no need to handle
this operation. Histogram graph view was added outside of preview frame
layout and there was no container view outside this. So histogram was
occupying complete screen.
Change-Id: I94c9e7e76f4bc5d1efb568280ca5c41585224ff9
(cherry picked from commit ad3ece51bf6e3b14c2a5a068ce937b89b4578e24)
(cherry picked from commit 348a7d8a67f06f3b6fbd999bc0b3ef81a364b5c1)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When switching from Panorama mode to Camera mode, the CameraActivity
invokes two functions openModule and onOrientationChanged.
openModule initializes PhotoModule. As part of the PhotoModule
initialization, the PhotoUI and PhotoMenu are initialized.
But this is acheived by posting a message to the handler. When the
message is read by the Handler, the PhotoUI's onCameraOpen is invoked
which initializes the PhotoMenu. But sometimes before this message
is read by the Handler, the onOrientationChanged is invoked, which
invokes couple of functions from PhotoUI class acting on the PhotoMenu.
But since the PhotoMenu is still not initialized, it throws up error in
the form of NullPointerExceptions.
Fix this by checking if the PhotoUI and PhotoMenu have been initialized.
If they have not yet been initialized, send a message to the Handler to
invoke these PhotoUI functionalities after the PhotoUI has been
initialized completely.
(cherrypicked from commit 774659c9f580b90a15a896881376075bb1506a05 )
Change-Id: Idb55e4f5ba29523c273ff66f11149ff271c490a4
(cherry picked from commit 42f1ffca2e43c4561f5bc3534a966c4bbe6cbef8)
(cherry picked from commit 8df298b693932da2c06dbfd40ad5bbe57dc96308)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When user switches between scene mode Auto to non-Auto,
the touch AF/AEC option is overridden from the UI and the
lower layers intimated to turn off Touch AF/AEC. However
when we switch back to scene mode Auto, the Touch AF/AEC
is turned off although user might have turned it ON before
switching to a non-auto scene mode. We need to remember the
user selection and restore back to that when user comes back
to the auto scene mode.
(cherrypicked from commit 9ff79cf9291dde975a2607adb6ff97d2dc1b0c17 )
Change-Id: I5f306445bc96a52c0f921d75e7a3b6e944bc7858
(cherry picked from commit 913c1bfd3465dc101a3c6ec3271588d895fc82b4)
(cherry picked from commit 63a0c7bcc9abb980a5813c76545b4a4d6acc1ec2)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Flip operation needs to be done per stream. App will read from system
property about stream based flipping setting and set corresponding
parameters to let camera hardware to apply flipping setting per stream.
To keep app behavior persistent when flip and rotation are enabled,
need to take case H/V flip when 90 or 270 rotation happens. Need
to reverse H/V flip to acheive same output no matter device is in
portait or landscape mode.
(cherrypicked from commit b38b8246204871082dc7ac6f5e626d6162d2be70)
Change-Id: Ia06060709162237dece1a05a3ae58429a0c99b06
Conflicts:
src/com/android/camera/util/CameraUtil.java
(cherry picked from commit b6aff328cdd99fb0db11c989a72f5eafd7d82324)
(cherry picked from commit 29888be992b8955f88a2f89ffd407733d771c1e6)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously picture format only have option for jpeg and raw,
but detailed raw image format is misssing from menu to choose.
Also, changes to save raw image to coorect path
are included.
(cherrypicked from commit c0028f9dbe178c3fed1bcb4af96eb0db4d2e2973)
Change-Id: Ifab7fd80e4a83370b2dc6932340005a06cc3552f
(cherry picked from commit 27f9245f35d0284c17d8d2fdf5576ea3879e7d33)
(cherry picked from commit 3c66703af119c06697f16303fadadbe956646cb3)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add support for burst snapshot in ZSL usecase. Modify the JPEG
picture callback to change focus states only after all the snapshots
are received. Also generate new image names for the burst snapshots
taken using single capture command.
(cherry picked from commit 88bd49c06bde108930fa851b8750a35fe225dd38)
Change-Id: I402a3ecc888096a7188f16ee2ace0fcb7752e8e3
Conflicts:
src/com/android/camera/PhotoModule.java
Conflicts:
src/com/android/camera/PhotoModule.java
(cherry picked from commit 3e325e74fb8b163f1fcf6913d0ee986ce43426c8)
(cherry picked from commit 22e4c200bb10db52abc9a889bdb2020fa0f794b8)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- This change enables the camera client to
configure the face recognition feature
depending on the camera support of the lower
layers.
(cherrypicked from commit 9d469e2a66859fe5070d9651a41d0ca330ccc8cb)
Change-Id: I141632e27cbef3bb53ea06a249491eff78b5f13b
(cherry picked from commit b420162dd9c1f974628e8e7ff83bc0909c59e272)
(cherry picked from commit 9c258ff94e7ce18c7e4072b83203092bd3d4c0d1)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- This modification re-enables the AE bracketing UI
option and adds the necessary logic for parsing
and filtering the supported AE bracketing modes by
the camera.
(cherrypicked from commit 0b2b18f2a6b89da004db8c36420fc61f0e884290)
Change-Id: I5aea466eed9a3de4a899cced1e03c5177e57104b
Conflicts:
src/com/android/camera/CameraSettings.java
Conflicts:
src/com/android/camera/CameraSettings.java
(cherry picked from commit 8cd8e6797ed3ce856bb4d7771085e1678bea7f25)
(cherry picked from commit 24b84fd5855235b8710a625e42a0f2879cc1d898)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added keys and APIs for enabling QC features from UI.
(cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21)
Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/PhotoMenu.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/VideoModule.java
(cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376)
(cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When user switches from one camera to other the zoom values were
stored in a class variable. Due to which the application was using
the same zoom value for different preview size cameras. And which
was making the app to apply same zoom value for two different sizes
while rendering. This change will enable the app to use different
zoom values for different preview sizes.
(cherry picked from commit cf97ea085c2258173f13c757d20eaffcafe23de9)
Change-Id: I1cd0994b4b4ebc8eba931f4b05512871897bf8c6
(cherry picked from commit 6fa132eca1ff1872e3fee8e842b570d30c55c78e)
(cherry picked from commit 8c4cdf02fd57f4a008f01ed0e97bcf4b3c8d88cd)
(cherry picked from commit e2ddc26ba302add0d8e10121927bc8f35e89795b)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
KPI words are defined for Shutterlag.
Change-Id: I544b3b7050f724cf915e2625bea1fb53c7ca9258
(cherry picked from commit 14124588b6e98167153578174d0ed9d9d341dfa7)
(cherry picked from commit 644a7e8e6d5b3a7c7b569d2aa368fdc23468d57f)
(cherry picked from commit 66138a1bf4923a47943ac8e01ca24acbb89feda6)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Make HDR off in UI when ZSL is on
(cherrypicked from commit 9f00bc61e0fda6caa4d5bc7ed41329c4389145c3 )
Change-Id: Iabc668ab2b276f3eec81a4a454d1ba2213e84cea
(cherry picked from commit 8e3b4e324211829c95b125290d278d317b49faa1)
(cherry picked from commit 1107a9e7733e425efe08fcc181f59002eb8b43cd)
(cherry picked from commit f14f055a429a136dfb0ecb1f0719e21c71c327cd)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also disable the FD start flag from stopPreview.
(cherrypicked from commit 2ae27a714a9f0e4d2369f3d080d41982f76c8e2f)
Change-Id: Ic6fe9d119633627b94f3635d59eedd87db1709c9
(cherry picked from commit 14c156cc70ac1a181539102fd899a24858589422)
(cherry picked from commit 2e7cb29544fc26de520762aea4cd6d8dc2749639)
(cherry picked from commit 98b6affb83eb092a25e294b6447d49f6c048cea2)
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Histogram is disabled after every capture and enabled during
preview. For ZSL mode, histogram is not disabled after capture.
(cherry picked from commit cb58b0e64c05eb0c0173aa198e2836fc6a7467a0)
Change-Id: Ibf32cb56d0b1c11b321f7a36e4c53f5d036ff671
(cherry picked from commit 91edd2cf79da7dbd21175ed1331c6655529c4e5b)
(cherry picked from commit 6f2344ba8dda48557f05302ec6b689e4123dcaf8)
(cherry picked from commit 9add261e83cbb2b74cb0ab67115886eec321b0b9)
|
| |/
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
| |
Bug: 10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
|
| |\
| |
| |
| | |
into gb-ub-photos-carlsbad
|
| | |
| |
| |
| |
| | |
Bug: 11010544
Change-Id: Iaa5a2d8bcc3ece583376517e006018b0c8b75587
|
| |\ \ |
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |/
|
|
|
| |
Bug: 10928549
Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
|
| |
|
|
|
| |
Bug: 11010544
Change-Id: I782bf3bd52f7b37cf47291501560ba771951760a
|
| |
|
|
|
|
| |
bug:11115082
Change-Id: I2532e9597f526eb7daea9753b019d5ed95f5fe6b
|
| |
|
|
|
|
|
|
|
|
| |
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
|
| |\ |
|
| | |
| |
| |
| |
| |
| | |
Bug: 11047147
Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
|
| |/
|
|
|
| |
Bug: 11005574
Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
|
| |
|
|
|
|
| |
bug:10860305
Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
|
| |
|
|
|
|
|
|
|
| |
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
|
| |\
| |
| |
| | |
gb-ub-photos-carlsbad
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| |/
|/| |
|