summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Collapse)AuthorAgeFilesLines
* Allow scaling beyond 1:1 in zoom viewDoris Liu2013-10-082-5/+25
| | | | | Bug: 10950226 Change-Id: I38828edaf4010170f6c6db18b8c5fdeef91b4f11
* Merge "Do not allow navigation to filmstrip during video recording" into ↵Doris Liu2013-10-092-4/+9
|\ | | | | | | gb-ub-photos-carlsbad
| * Do not allow navigation to filmstrip during video recordingDoris Liu2013-10-082-4/+9
| | | | | | | | | | Bug: 11064867 Change-Id: I168136a193008578b3ad2642cba764650bcc2487
* | Add shutter click sound in SoundClips.Angus Kong2013-10-081-3/+8
|/ | | | | | bug:11135055 Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d
* Correct sample factor for rotated images in zoom viewDoris Liu2013-10-071-1/+11
| | | | | Bug: 11067085 Change-Id: I52093052393fb1b2db08f105b8a16b68c3d3c95a
* Keep the ImageData size info consistent with MediaStore and Exifztenghui2013-10-073-38/+28
| | | | | | | | Basically, the width and hight in the ImageData will be pre-rotation. bug:11067085 Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858
* Revert CL that added broadcast receivers for shutter control.Sascha Haeberling2013-10-061-30/+1
| | | | | | | | | | 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
* Don't show the option for Gcam when using front camera.ztenghui2013-10-041-2/+5
| | | | | | bug:11051221 Change-Id: I802eb0bc73adb3c573a2bf62b312bc681152223d
* Merge "Prevent picture taking via volumn key in filmstrip mode" into ↵Doris Liu2013-10-041-8/+10
|\ | | | | | | gb-ub-photos-carlsbad
| * Prevent picture taking via volumn key in filmstrip modeDoris Liu2013-10-031-8/+10
| | | | | | | | | | Bug: 11045068 Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212
* | Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbadErin Dahlgren2013-10-031-1/+1
|\ \
| * | Make space for photosphere rendering textErin Dahlgren2013-10-031-1/+1
| | | | | | | | | | | | | | | Bug: 11005014 Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
* | | Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbadSascha Haeberling2013-10-035-35/+30
|\ \ \
| * | | Change icons and code from HQ to HDR+ mode.Sascha Haeberling2013-10-035-35/+30
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11047147 Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
* | | | Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbadAngus Kong2013-10-036-22/+227
|\ \ \ \
| * | | | Don't allow actions on items in progress.Angus Kong2013-10-036-22/+227
| |/ / / | | | | | | | | | | | | | | | | | | | | bug:11049529 Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
* | | | Merge "Leave ROI not set except in tap-to-focus scenario" into ↵Doris Liu2013-10-032-3/+6
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-carlsbad
| * | | Leave ROI not set except in tap-to-focus scenarioDoris Liu2013-10-032-3/+6
| | |/ | |/| | | | | | | | | | Bug: 11005574 Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
* | | Merge "Only show delete action when in secure camera mode." into ↵ztenghui2013-10-031-0/+5
|\ \ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | Only show delete action when in secure camera mode.ztenghui2013-10-021-0/+5
| | |/ | |/| | | | | | | | | | bug:11048260 Change-Id: Idcf452e91983acdfad17ce1cc503b25d17c2e53c
* | | Exit Camera on Up button if no APP_GALLERY handler found.Mangesh Ghiware2013-10-021-3/+9
| | | | | | | | | | | | | | | Bug: 11047289 Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c
* | | Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere ↵Erin Dahlgren2013-10-021-9/+17
|\ \ \ | | | | | | | | | | | | viewer icon is visible." into gb-ub-photos-carlsbad
| * | | Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon ↵Erin Dahlgren2013-10-011-9/+17
| | |/ | |/| | | | | | | | | | | | | | | | is visible. Bug: 10715651 Change-Id: Ib71a3e4469d1ecee87b9423b03b8898294a7ffa6
* | | Merge "Make scroll animation smoother." into gb-ub-photos-carlsbadAngus Kong2013-10-021-26/+84
|\ \ \ | |_|/ |/| |
| * | Make scroll animation smoother.Angus Kong2013-10-011-26/+84
| |/ | | | | | | | | | | bug:10802703 Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4
* | Merge "Fix FilmStrip crash by checking if photos are present before updating ↵Erin Dahlgren2013-10-011-1/+4
|\ \ | | | | | | | | | action bar" into gb-ub-photos-carlsbad
| * | Fix FilmStrip crash by checking if photos are present before updating action barErin Dahlgren2013-10-011-1/+4
| |/ | | | | | | | | Bug: 11027838 Change-Id: I770f8d0187b4f92f5395b27496620acb099eeb6a
* / A workaround for crash in zoom viewDoris Liu2013-10-011-0/+5
|/ | | | | Bug: 10636636 Change-Id: Iffa126781fd71796b8816d637263450911cb7e8e
* Prevent NPE in gesture handling.Angus Kong2013-10-011-0/+4
| | | | | | bug:11023769 Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
* Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbadDoris Liu2013-10-011-6/+11
|\
| * Double tap to full screen from filmstripDoris Liu2013-09-271-6/+11
| | | | | | | | | | | | | | Also fix the first photo going from full screen to filmstrip on single tap Bug: 10948166 Change-Id: I15df0325f495722f43b17e0713d6196e8585aa75
* | Merge "Updates newly centered photos in FilmStrip after a delete." into ↵Erin Dahlgren2013-10-011-0/+1
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Updates newly centered photos in FilmStrip after a delete.Erin Dahlgren2013-09-301-0/+1
| | | | | | | | | | | | | | | | | | Bug: 10715651 Change-Id: Idf4029270c5d0de2885322b2e25ad75e98def84a
* | | Merge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbadAngus Kong2013-10-011-4/+8
|\ \ \
| * | | Don't adjust the position while scrolling.Angus Kong2013-09-301-4/+8
| |/ / | | | | | | | | | | | | | | | bug:10802703 Change-Id: I493c36b87c99de97275add1243f5ac363a28787e
* | | Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbadSascha Haeberling2013-10-013-8/+1
|\ \ \
| * | | Show status bar in filmstrip modeSascha Haeberling2013-09-303-8/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11005642 Also makes sure we only call setSystemUiVisibility in only one place. Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa
* / / Fix MediaStore correction code.ztenghui2013-09-301-0/+44
|/ / | | | | | | | | | | | | | | | | | | This reverts commit fb344efde20ffab903fae7c6e5a2e1c90b4ef085. And this CL make sure we handle rotated image correctly and update the MediaStore according to the bitmap size. bug:10988273 Change-Id: I9acb60e0dd485292748bcc586801f76bc7a543dc
* | Temporary removal of resize code to evaluate GCam image bugAlan Newberger2013-09-291-40/+0
| | | | | | | | | | | | | | | | | | removes LocalMediaData resize code to evaluate black screenshots. this results in correct display of GCam photos newly taking in KRS91; prior GCam photos will look distorted due to incorrect EXIF. Bug: 10988273 Change-Id: I7fedffeeb1823da857f4c92433c6213d6697bda0
* | Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into ↵Sascha Haeberling2013-09-282-1/+26
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Add basic EXIF to the tiny planet so that rotate succeeds.Sascha Haeberling2013-09-272-1/+26
| | | | | | | | | | | | | | | | | | Bug: 10861115 Change-Id: I1eec2bf4d6879c227a07c5364bc821749ace312b
* | | Fix incorrect width and height from MediaStore.ztenghui2013-09-276-18/+81
| | | | | | | | | | | | | | | | | | bug:10768232 Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf
* | | Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbadAngus Kong2013-09-271-3/+0
|\ \ \
| * | | Restore HQ preference in GCam module.Angus Kong2013-09-271-3/+0
| |/ / | | | | | | | | | | | | | | | bug:10860305 Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
* / / Don't update the width and height in MediaStore after rotationztenghui2013-09-271-7/+5
|/ / | | | | | | | | | | bug:10917681 Change-Id: I897d883636991f5b95290acf57c2a84eadd7c5d2
* | Merge "Add orientation information to the details dialog." into ↵Sascha Haeberling2013-09-272-0/+4
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Add orientation information to the details dialog.Sascha Haeberling2013-09-262-0/+4
| |/ | | | | | | | | | | Bug: 10649902 Change-Id: Icaf17abdbd48a86d55e1555115fdb7817faf6359
* / Fix memory leak of context in LocalMediaObserverDoris Liu2013-09-262-30/+29
|/ | | | | Bug: 10728773 Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
* Remove PopupManager to remove a memory leakSeth Raphael2013-09-264-75/+0
| | | | | | | | | 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
* Add HQ icon indicator support.Sascha Haeberling2013-09-261-2/+9
| | | | | | Bug: 10785988 Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca