summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* Redo snapshot if shutter button is clicked during SNAPSHOT_IN_PROGRESSreplicant-6.0-beta-0002replicant-6.0-beta-0001replicant-6.0-alpha-0006replicant-6.0Wolfgang Wiedmeyer2016-12-301-24/+34
| | | | | | | | | | | | | If the shutter button is clicked in the photo view, the interface will be in the SNAPSHOT_IN_PROGRESS state until the picture is taken. During this state, the app is unresponsive and if there is an issue with the camera HAL, the app may not leave this state. Let's restart the camera if the shutter is clicked a second time during this state and redo the snapshot. Previously, the app only registered that the shutter was pressed a second time and tried to take a second picture after the previous snapshot was finished. Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
* Merge branch 'master' of ↵Wolfgang Wiedmeyer2016-12-121-2/+15
|\ | | | | | | https://android.googlesource.com/platform/packages/apps/LegacyCamera into replicant-6.0
| * Prevent camera app crashes on changing hw.camera.* settingsLingfeng Yang2016-04-271-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the AVD's config.ini changes hw.camera.*, this is effectively, connecting/disconnecting camera hardware, and the current way in which camera settings are handled assumes that the set of cameras never changes, which can lead to the camera app crashing if the camera app was used successfuly with one configuration of hw.camera.* and then the AVD was restarted with a different configuration. In particular, the crash happens if the number of cameras has been reduced since the last run, and the camera app is looking up a preferred camera ID that is not supported by the new number of cameras. bug: 28417929 BUG: https://code.google.com/p/android/issues/detail?id=206945 Change-Id: Ib0e26ae77d376f31f3cc281e386d3c67291c1edc (cherry picked from commit 8f339abd9245577c348f5ba22322e8801c21faf8)
| * Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
| |\
| | * Loading the corresponding library in LegacyCamera appJun Tian2013-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The LegacyCamera app is loading wrong library in MosaicRenderer.java. It causes the camera app crash in the SDK image when changing the camera to panorma mode. Change-Id: I4c20af796622dd0e76a86ed7249d9b8fa54837b9
| * | Fix the loading library issue of panorama mode in Legacycamera appJun Tian2013-07-041-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The Legacycamera app requires libjni_legacymosaic module, and this module is included in the makefile. But in the implementation code, it loads the libjni_mosaic module. This patch changed the loading library to fix crash issue when using panorama mode in the Legacycamera. Change-Id: Id7d4192b076412c674ef716c9ffcb31fe5cb6619 Signed-off-by: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Zhu Yanglinx <yanglinx.zhu@intel.com> Signed-off-by: Chang Panfeng <panfengx.chang@intel.com>
* | make Camera work on lock screen (secure mode)HEADmasterWolfgang Wiedmeyer2015-10-093-3/+78
| | | | | | | | Change-Id: I2ea9993738430f8c59f9e69cd2f75e6acccdc9eb
* | LegacyCamera: Load correct panorama JNI libsKonsta Tuomio2012-12-152-2/+2
|/ | | | Change-Id: I26f7ada118874d00667e7a4373ceae10adcb30de
* Fix camera_control distorted in small resolution.akahuang2012-06-151-1/+7
| | | | | | | Use minimum height of camera_control to fix it. bug:6228273 Change-Id: I7c623efe06e043664d696f753f08877cd34450a1
* Fix NPE when only front cameras are available.Angus Kong2012-06-134-26/+9
| | | | | bug:6643208 Change-Id: Ie4eef4a671091cd9557d1c51ab5c3919b6b30652
* Rename Camera to LegacyCamera for SDK inclusion.Eino-Ville Talvala2012-06-044-16/+16
| | | | | | | The SDK needs a camera app that does not require GPU acceleration. The Camera app from 4.0.4 meets these requirements. Change-Id: Idb42d4b9e47d584ef1da10e3ba672d537c8db94b
* Fix the share popup. DO NOT MERGEAngus Kong2012-02-181-33/+1
| | | | | | | | | | Fix the share popup to comply with the new design: 1. Black background. 2. Image is centered. 3. Share popup won't rotate automatically. bug:6031042 Change-Id: I86b15a19bc8f7598d444cd9032960ea02e251668
* Merge "Do not allow switching to other activities during panorama capture. ↵Wei Huang2012-01-201-0/+15
|\ | | | | | | (do not merge)" into ics-mr1
| * Do not allow switching to other activities during panorama capture. (do not ↵Wu-cheng Li2012-01-201-0/+15
| | | | | | | | | | | | | | merge) bug:5541182 Change-Id: I1cdbba9a8aec3b5c832f6e58baa26ff6312cf59a
* | Allow saving panorama after the activity is paused. (do not merge)Angus Kong2012-01-122-33/+69
|/ | | | | bug: 5541182 Change-Id: I42237d8dd4f8c39ddc2041ae32b886328a9c45c0
* Use default volume control stream instead of the music stream.Eino-Ville Talvala2012-01-051-2/+0
| | | | | | | | Since the Camera API is moving back to using the system audio stream, do not override the camera app volume control stream any more. Bug: 5778365 Change-Id: I27a6a1769d39cb0b246bce7d721d846f6c1430d1
* Fix crash after restoring defaults.Wu-cheng Li2011-12-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After restoring defaults in camcorder mode, the indicator control calls onSharedPreferenceChanged if record location is on. onSharedPreferenceChanged is also called in the end of restorePreferences. With two onSharedPreferenceChanged calls in a row, the first call notices effects have been disabled, and begins the effect pipeline teardown in the background thread. Normally, this would conclude in a few hundred milliseconds, and would then restart regular preview. However, with the second call to onSharedPreferenceChanged coming in right after the first, the method no longer sees an effect transition in progress (since current and new effect are equal to none now), and thus just ends up restarting preview. That attempt at restart runs into the crash because the main SurfaceView has not yet been released by the background effects thread. To fix this, InLineSettingSwitch should not invoke the listener when updating UI. bug:5679133 Change-Id: I06aca382105455585b633dc63f014a8f71ccadbe
* Fix NPE if the camera cannot be connected.Wu-cheng Li2011-11-281-1/+1
| | | | | bug:5673972 Change-Id: I85587bd982e0af5dd7c3630958e105571d8e12d9
* Dismiss open menu if exists.Chung-yih Wang2011-11-223-0/+11
| | | | | bug:5648754 Change-Id: I44be2226e65de76e6240adc7b554e0ee7cda2226
* Update camera sound API.Wu-cheng Li2011-11-184-8/+21
| | | | | bug:5640219 Change-Id: Ic3af6527f3025ec04ba4be16b621b462f89953f1
* Merge "Fix NPE in panorama when camera failed to connect." into ics-mr1Chih-yu Huang2011-11-181-20/+18
|\
| * Fix NPE in panorama when camera failed to connect.Chih-yu Huang2011-11-181-20/+18
| | | | | | | | | | bug:5637587 Change-Id: Iea275b4e3780a41f4a0c3fe0845acbfdb1e95cd1
* | Merge "Fix OpenGL processing when activity is not active." into ics-mr1Angus Kong2011-11-171-0/+6
|\ \ | |/ |/|
| * Fix OpenGL processing when activity is not active.Angus Kong2011-11-181-0/+6
| | | | | | | | | | bug:5624690 Change-Id: I87af684e165a275adb4b765a86a2df2b62137ca0
* | Merge "Rotate priority indicators according to the device orientation." into ↵Wei Huang2011-11-171-2/+7
|\ \ | |/ |/| | | ics-mr1
| * Rotate priority indicators according to the device orientation.Wu-cheng Li2011-11-171-2/+7
| | | | | | | | | | | | | | | | + Do not show flash indicator if it is off. bug:5039279 Change-Id: I329b63d04f46fbe23f5ade3e4cacf446ce41f98c
* | Merge "Fix EffectsRecorder error path handling when ending recording." into ↵Eino-Ville Talvala2011-11-161-1/+7
|\ \ | | | | | | | | | ics-mr1
| * | Fix EffectsRecorder error path handling when ending recording.Eino-Ville Talvala2011-11-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if mRunner had already been set to null, errors sent by mediarecorder would not be propagated to VideoCamera correctly. This resulted in crashes when putting device to sleep right after starting timelapse recording with effects. Bug: 5627242 Change-Id: I3ae3c713a0aaf9a4507442bbbcd3ec89971d5f95
* | | Merge "Update the panorama capturing progress correctly." into ics-mr1Wei-Ta Chen2011-11-161-17/+20
|\ \ \
| * | | Update the panorama capturing progress correctly.Wei-Ta Chen2011-11-151-17/+20
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue that the termination condition on the sweeping angle is broken. Fix another issue that the panning speed and sweeping angle does not consider the cases that users hold a device in portrait or panning the device vertically. Bug: 5623138 Change-Id: I9d1e2e5ad63a97beb8cfe2404974329c70d46991
* | | Merge "Fix crash: camera swap w/ custom Background video" into ics-mr1Pannag Sanketi2011-11-161-4/+13
|\ \ \
| * | | Fix crash: camera swap w/ custom Background videoPannag Sanketi2011-11-151-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The background uri was not getting stored when swapping the camera leading to a crash. Now it is sent via the intent. Related Bug: 5585381 Change-Id: I05aea8321f0d2df96f646119eddd6a8b6a8ac668
* | | | Merge "Fix the ArrayIndexOutOfBound issue." into ics-mr1Wei Huang2011-11-161-13/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix the ArrayIndexOutOfBound issue.Chung-yih Wang2011-11-161-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5619774 It was caused by the error of the radian computation for rotation of the indicator wheel. Originally we assume the angle of the first and the last indicator in the second-level settings should be the same as predefined angles. In fact, there was some computational error during rotation. Change-Id: I508f42c5224170ac721562e20be8ed638485e023
* | | | Merge "Broadcast for new image added in panorama mode." into ics-mr1Angus Kong2011-11-161-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Broadcast for new image added in panorama mode.Angus Kong2011-11-161-0/+1
| | |/ | |/| | | | | | | | | | bug:5624740 Change-Id: I0663b34eb07e28e3f4e8b65b0c2c2befce3ca430
* | | Fix NPE if the device has only one camera.Wu-cheng Li2011-11-161-1/+3
|/ / | | | | | | | | bug:5620872 Change-Id: I4ee2aa85e73c53d6a72f0839ed3bf31bc14c586e
* | Merge "Set the orientation of a panorama image." into ics-mr1Wei-Ta Chen2011-11-153-5/+56
|\ \
| * | Set the orientation of a panorama image.Wei-Ta Chen2011-11-153-5/+56
| |/ | | | | | | | | | | | | | | | | | | | | | | The panorama image returned from the panorama library is oriented based on the natural orientation of the camera. We set an orientation in its EXIF header, so that the image can be displayed correctly. The orientation is calculated by compensating the device orientation and the camera orientation respective to the natural orientation of the device. Bug: 5603313 Change-Id: Id6907cb08a7ff77e44736f3c3cd1503e7a68d783
* | Merge "Start Effects Recording only after preview loads" into ics-mr1Pannag Sanketi2011-11-152-0/+18
|\ \
| * | Start Effects Recording only after preview loadsPannag Sanketi2011-11-152-0/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | Start Effects Recording only after we get SurfaceTexture Callback in EffectsRecorder, and hence preview loaded. Disable the shutter button on creation, and re-enable it on the preview callback. Else, one could potentially start the recording before the preview loads, leading to a wrong state information and an eventual crash. Related Bugs: 5605173, 5605658 Change-Id: I2ed766997294c165ce6c262cf47f124493d0c5ec
* | Merge "Switch sound playing to use Camera.playSound()" into ics-mr1Eino-Ville Talvala2011-11-155-211/+15
|\ \
| * | Switch sound playing to use Camera.playSound()Eino-Ville Talvala2011-11-085-211/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a few private APIs to properly manage audio output for panorama, effects recording, and focus notification, use the new Camera API for sound playback. Bug: 5447107 Change-Id: I7d5a3d9502f36c199ea75a89e2c6b878185f880f
* | | Add location information in Camcorder mode.Angus Kong2011-11-151-0/+5
| |/ |/| | | | | | | bug:5560253 Change-Id: I090722d6755068fa4a70a900e18af28a1adc9bf1
* | bug #5612744: guard against NPE found by Monkey.Wei Huang2011-11-141-0/+21
| | | | | | | | | | | | | | | | cl https://android-git.corp.google.com/g/#/c/149421/5 removed the null pointer checking. This leads to Monkey crashes. It seems that we either need to call initOnScreenIndicator() in onCreate(), or check for null in the updateXXXIndicator() methods. I thought about moving initOnScreenIndicator() to onCreate(), but didn't want to introduce any latency for starting up the camera app. Change-Id: I8b9fecb5eb77dc1afef9725fd3d3d4dbe5048c9d
* | Merge "Fix several UI bugs." into ics-mr1Wei Huang2011-11-141-2/+2
|\ \
| * | Fix several UI bugs.Chung-yih Wang2011-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5575970 1. The cancel button of the background replacer message should be on the bottom. 2. The location of recording timer was too low in the landscape mode. 3. Fix the animation of the setting popup. Change-Id: Ia2345e72efc0118cd0172af4bd6243815c602493
* | | Merge "Fix too small panorama review on phones." into ics-mr1Wei Huang2011-11-141-0/+1
|\ \ \
| * | | Fix too small panorama review on phones.Angus Kong2011-11-141-0/+1
| |/ / | | | | | | | | | | | | bug:5611399 Change-Id: I09c400d0faa7e5753a728f2a8ba9a8bc4fcf5a77
* | | Add a rotatable toast class.Chung-yih Wang2011-11-143-39/+66
|/ / | | | | | | | | | | | | | | | | | | bug:5575970 In order to show the toast in a landscape orientation with portrait layout. The rotatable toast helper class is implementated and is also applied for first-hint toast messages. Change-Id: I942e87df1c1a4509d01cd41e2ecbdc2e2dfec049
generated by cgit v1.1 at 2024-05-14 01:18:53 +0000