summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/panorama
Commit message (Collapse)AuthorAgeFilesLines
* LegacyCamera: Load correct panorama JNI libsKonsta Tuomio2012-12-152-2/+2
| | | | Change-Id: I26f7ada118874d00667e7a4373ceae10adcb30de
* Rename Camera to LegacyCamera for SDK inclusion.Eino-Ville Talvala2012-06-041-5/+5
| | | | | | | 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
* 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-121-6/+34
|/ | | | | bug: 5541182 Change-Id: I42237d8dd4f8c39ddc2041ae32b886328a9c45c0
* Dismiss open menu if exists.Chung-yih Wang2011-11-221-0/+5
| | | | | bug:5648754 Change-Id: I44be2226e65de76e6240adc7b554e0ee7cda2226
* Update camera sound API.Wu-cheng Li2011-11-181-3/+7
| | | | | 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
* | Fix OpenGL processing when activity is not active.Angus Kong2011-11-181-0/+6
|/ | | | | bug:5624690 Change-Id: I87af684e165a275adb4b765a86a2df2b62137ca0
* 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
* | Broadcast for new image added in panorama mode.Angus Kong2011-11-161-0/+1
|/ | | | | bug:5624740 Change-Id: I0663b34eb07e28e3f4e8b65b0c2c2befce3ca430
* Merge "Set the orientation of a panorama image." into ics-mr1Wei-Ta Chen2011-11-151-4/+45
|\
| * Set the orientation of a panorama image.Wei-Ta Chen2011-11-151-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | 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 "Switch sound playing to use Camera.playSound()" into ics-mr1Eino-Ville Talvala2011-11-151-39/+3
|\ \ | |/ |/|
| * Switch sound playing to use Camera.playSound()Eino-Ville Talvala2011-11-081-39/+3
| | | | | | | | | | | | | | | | | | 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
* | Fix too small panorama review on phones.Angus Kong2011-11-141-0/+1
|/ | | | | bug:5611399 Change-Id: I09c400d0faa7e5753a728f2a8ba9a8bc4fcf5a77
* Fix an OOM issue in mosaic blending.Wei-Ta Chen2011-11-041-1/+12
| | | | | | | | | | | | Set two limits on when we will do mosaic blending. 1) mosaic_width * mosaic_height < (5 * frame_width) * (2 * frame_height) 2) mosaic_height < 2.5 * frame_height The latter limit rejects blending for the cases having too much movement in the secondary direction. Bug: 5554762 Change-Id: I05fb24bb1ff5446bea0cc1a1de8a02c37fb642d7
* Merge "The dialog for comfirmation is made rotatable." into ics-mr1Wei Huang2011-11-031-71/+14
|\
| * The dialog for comfirmation is made rotatable.Angus Kong2011-11-031-71/+14
| | | | | | | | | | | | bug:5481928 Change-Id: Ic9a34b0f9e8d920afa5aec36561892045480e18c
* | Adjust the orientation of mode picker in Panorama.Angus Kong2011-11-031-1/+3
|/ | | | | | bug:5561505 Change-Id: Iafd9e7ba4c60b4decae8f676ef2a1709cf54e5bb
* Change the default orientation to portrait.Chung-yih Wang2011-11-011-30/+90
| | | | | | | | | | | | bug:5446617 Since the orientation is mainly portrait on phones, the default orientation of an application will decide if the window animation will be played before it starts. In order to reduce the launch time of Camera apps, this change is to skip the window animations by changing the default orientation to portrait. Change-Id: I6682ab408d7e8d1f0580f3c1600b6c9c3d6a7f6e
* am 174b8b7f: Add forced sound for panorama mode.Angus Kong2011-10-311-0/+42
|\ | | | | | | | | * commit '174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d': Add forced sound for panorama mode.
| * Add forced sound for panorama mode.Angus Kong2011-10-311-0/+42
| | | | | | | | | | bug:5538024 Change-Id: I59b662a0cc53471ba905391c016c78ebd9ae1d73
* | Fix 5520611: Sleep after no interaction fow two minutes.Chih-Chung Chang2011-10-281-2/+34
| | | | | | | | Change-Id: I33b38fa54302c0dbf98298e28c9457c9bf61bb7d
* | Make Panorama work in portrait layout.Wei-Ta Chen2011-10-264-11/+31
| | | | | | | | | | | | | | | | Add the support of both portrait and landscape layout to the panorama library. Add a step into the preview renderer that rotates the content in the offscreen buffer by 90 degrees in the case of a portrait layout. Change-Id: I879e3476daac522b0c8b27fe3ef5b17ebf0797e3
* | am 7d9eadd0: Fix 5491362: don\'t open the camera in onResume in lockscreen.Jim Miller2011-10-212-6/+5
|\ \ | |/ | | | | | | * commit '7d9eadd0c6c38b3761b7e8d3fa3658d194810d60': Fix 5491362: don't open the camera in onResume in lockscreen.
| * Fix 5491362: don't open the camera in onResume in lockscreen.Jim Miller2011-10-212-6/+5
| | | | | | | | Change-Id: I678dd23f1603647e801c339a557fc08b53dbfa38
* | am 7b52266b: Merge "Add hysteresis to orientation rounding." into ics-mr0Eino-Ville Talvala2011-10-191-5/+1
|\ \ | |/ | | | | | | * commit '7b52266b6f9af570f1fdb200a1d0fa7947344e1a': Add hysteresis to orientation rounding.
| * Merge "Add hysteresis to orientation rounding." into ics-mr0Eino-Ville Talvala2011-10-191-5/+1
| |\
| | * Add hysteresis to orientation rounding.Eino-Ville Talvala2011-10-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | This prevents fast flickering between two orientation states, which can result in ugly UI issues, especially with the preview thumbnail. Bug: 5477483 Change-Id: I9513547207ae1918066c1a19947c974eaad72e24
* | | am 66188959: Fix getting an empty thumbnail in reviewing panorama.Wei-Ta Chen2011-10-181-5/+8
|\ \ \ | |/ / | | | | | | | | | * commit '66188959498860c8b43ab7b9119c7b5c890c83dc': Fix getting an empty thumbnail in reviewing panorama.
| * | Fix getting an empty thumbnail in reviewing panorama.Wei-Ta Chen2011-10-181-5/+8
| |/ | | | | | | | | | | | | | | | | | | | | The sample size for generating a thumbnail should be calculated in a way that also considers the case of a portrait image, i.e., height > width. The SharePopup should also puts the thumbnail of a portrait panorama in the center of the thumbnail view. Bug: 5411488 Change-Id: I5e86a91829de77f4694c039bd871e6831f3906cb
* | am d7a60abb: Merge "Disable Thumbnailview when Panorama capture is ↵Wei Huang2011-10-181-0/+3
|\ \ | |/ | | | | | | | | | | inProgress." into ics-mr0 * commit 'd7a60abbee203872df4b5ab9a873e7efad80e239': Disable Thumbnailview when Panorama capture is inProgress.
| * Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0Wei Huang2011-10-181-0/+3
| |\
| | * Disable Thumbnailview when Panorama capture is inProgress.heech.park2011-10-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Step 1: Go to Camera Step 2: Change to Panorama shot Step 3: Capture Step 4: During capture tap on the album quick view Step 5: Observe that we are able to view album from quick view while capturing as panorama shot. bug:5475248 Change-Id: Ia74906e4a4c6b8b04e96724f76f98a37eaeb3189 Signed-off-by: Braganza Sam Roberts <sam.braganza@samsung.com>
* | | am 046b8ced: Merge "Use calculated frame offset instead of gyroscope." into ↵Wei Huang2011-10-182-75/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr0 * commit '046b8ced839d1b04c32d1207fe53f7639d69453b': Use calculated frame offset instead of gyroscope.
| * | Use calculated frame offset instead of gyroscope.Angus Kong2011-10-182-75/+22
| |/ | | | | | | | | bug:5359162 Change-Id: I319e9d54e08a2d711dc63bafa2593d6d68ef06fb
* | am 1bca5eaa: Simplify code about ShutterButton.Wu-cheng Li2011-10-131-7/+2
|\ \ | |/ | | | | | | * commit '1bca5eaaa3c6d3fd36df572546715e4e515cf9e6': Simplify code about ShutterButton.
| * Simplify code about ShutterButton.Wu-cheng Li2011-10-131-7/+2
| | | | | | | | | | bug:5447399 Change-Id: I240d7523509f27d333a0ef69e6e0d3228a41e9de
* | am ac65f661: Merge "The orientations use right angles in Panorama." into ics-mr0Angus Kong2011-10-121-5/+5
|\ \ | |/ | | | | | | * commit 'ac65f66171c9ff18b2c9f24fd4deae64ccf6fc93': The orientations use right angles in Panorama.
| * Merge "The orientations use right angles in Panorama." into ics-mr0Angus Kong2011-10-121-5/+5
| |\
| | * The orientations use right angles in Panorama.Angus Kong2011-10-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | The original orientation is represented in 0, 1, 2, and 3. Now we use the right angles to ensure the consistency with Camera.java and VideoCamera.java. bug:5447850 Change-Id: I4bc97d4f5b76c8ae297da550b5097b38bd0cefea
* | | am ef011a1e: Cancel the mosaic computation when paused.Angus Kong2011-10-121-3/+8
|\ \ \ | |/ / | | | | | | | | | * commit 'ef011a1e479f8e801318eba2dccb50fac1590d3c': Cancel the mosaic computation when paused.
| * | Cancel the mosaic computation when paused.Angus Kong2011-10-131-3/+8
| |/ | | | | | | | | bug:5447804 Change-Id: Id8e3a9d0c140b572fa76cbe9cfb38abc6b53d871
* | bugfix 5422126 Panorama needs to load the thumbnail from the fileMark Wagner2011-10-121-6/+10
|/ | | | | | | | | | | | | | | | | | | | | | | | | | This change makes Panorama closer to Camera in the way the Thumbnail is loaded. But the Camera has a pretty different startup sequence so you should review this to make sure it's correct. Note that doing any IO on the UI thread can lead to ANR so we should consider making the thumbnail load from an async task instead. NOTES: In camera the sequence is like this: Thumbnail.loadFrom initThumbnailButton initializeFirstTime FIRST_TIME_INIT message onResume, surfaceChanged, So we initiate the call to Thumbnail.loadFrom via onResume or surfaceChanged. I removed the call to "updateThumbnailButton" from onStart to make this closer to what we do in Camera. Change-Id: I86283acbc9355f077d2966a018a3b972efe1c08c
* bugfix 5290450 Share UI should match redlinesMark Wagner2011-10-071-3/+28
| | | | | | | Incremental work towards matching the redline. This will probably require a review pass from UX to catch any missed items. Change-Id: I0496aa0fc1941f8ffa06050ae8fbed3fe7246878
* Merge "bugfix 5340803 Deleted panorama still shown."Mark Wagner2011-10-041-0/+1
|\
| * bugfix 5340803 Deleted panorama still shown.Mark Wagner2011-10-041-0/+1
| | | | | | | | | | | | Second part for this fix. 139755 has the first half. Change-Id: I9268bf3bb1a604f369fdf6056cb8a7dcd47b3632