summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Merge "Finalize deletion when app exits and for last photo" into ↵Doris Liu2013-09-261-0/+3
|\ | | | | | | gb-ub-photos-carlsbad
| * Finalize deletion when app exits and for last photoDoris Liu2013-09-261-0/+3
| | | | | | | | | | Bug: 10892925 Change-Id: I94a29ec26f657b5c6c2f784f05b63d45e5e3e010
* | Make ROI size 1/8 of longer edge of the imageDoris Liu2013-09-261-2/+2
| | | | | | | | | | Bug: 10863323 Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
* | Merge "Fix the checks for when to remove the HDR/HQ icons from the pie ↵Sascha Haeberling2013-09-251-3/+3
|\ \ | | | | | | | | | menu." into gb-ub-photos-carlsbad
| * | Fix the checks for when to remove the HDR/HQ icons from the pie menu.Sascha Haeberling2013-09-251-3/+3
| |/ | | | | | | | | | | Bug: 10932511 Change-Id: I4d80d028335c2f45c5c59d56898846a76755ec44
* | Merge "Checks for low storage in wide-angle pano mode." into ↵Angus Kong2013-09-255-28/+30
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Checks for low storage in wide-angle pano mode.Angus Kong2013-09-255-28/+30
| |/ | | | | | | | | | | | | | | | | | | 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
* | Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbadDoris Liu2013-09-254-7/+14
|\ \ | |/ |/|
| * Increase ROI size to 1/8 of the image widthDoris Liu2013-09-254-7/+14
| | | | | | | | | | Bug: 10863323 Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
* | Fix HQ mode change to allow return to regular photo mode.Ruben Brunk2013-09-241-1/+10
| | | | | | | | | | Bug: 10848559 Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3
* | Add HQ option and use it to switch to GCam.Sascha Haeberling2013-09-246-8/+25
| | | | | | | | | | | | | | Bug: 10430748 Bug: 10785988 Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
* | Enable gcam as HDR pie menu option.Ruben Brunk2013-09-243-11/+36
|/ | | | | Bug: 10430748 Change-Id: I0f589126bac895b31ef7475afd093680766de39e
* Remove hideybars from Camera.Sascha Haeberling2013-09-242-36/+13
| | | | | | Bug: 10859173 Change-Id: I6e6677ace3d1c35c974e003bebd25c9a43d43719
* Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbadDoris Liu2013-09-241-28/+45
|\
| * Fix SRI UX issues and improve UI efficiencyDoris Liu2013-09-241-28/+45
| | | | | | | | | | Bug: 10674078 Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
* | Merge "Allow user to tap on lock icon from secure camera." into ↵Angus Kong2013-09-242-4/+25
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Allow user to tap on lock icon from secure camera.Angus Kong2013-09-232-4/+25
| |/ | | | | | | | | | | bug:10857973 Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507
* | Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbadSascha Haeberling2013-09-241-2/+18
|\ \
| * | Localize the numbers in the time laps popup.Sascha Haeberling2013-09-231-2/+18
| |/ | | | | | | | | | | Bug: 10889796 Change-Id: I44c476519b785a83af1c72aed07378c5e02d9073
* | Merge "Sort and select the preview fps range for still image." into ↵ztenghui2013-09-232-2/+54
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Sort and select the preview fps range for still image.ztenghui2013-09-232-2/+54
| | | | | | | | | | | | bug:10842868 Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
* | Improve the animation to filmstrip.Angus Kong2013-09-205-85/+113
|/ | | | | | | | | | | 1. Remove the snap-in-center check at the end of scale animation. 2. Don't go back to full-screen when animating from camera preview to filmstrip. bug:10806298 bug:10864100 Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
* Hide action bar after a timeoutDoris Liu2013-09-203-31/+121
| | | | | | | | | | | Also make sure: 1) Action bar does not go away when the menu is showing 2) Extend the timeout if user swipe to a new image when action bar is visible 3) Hide action bar immediately when double-tap-to-zoom starts 4) Action bar persists in filmstrip mode (i.e. non-fullscreen mode) Bug: 10750342 Change-Id: I820dc2b57ced61f91246fffe3fecc4e60ea187ca
* Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbadAngus Kong2013-09-203-157/+189
|\
| * Refine Filmstrip gesture/position handling.Angus Kong2013-09-193-157/+189
| | | | | | | | | | | | | | | | bug:10749052 bug:10802996 bug:10711578 Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e