summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix build: Don't build GCam for non-arm targetsRuben Brunk2013-09-232-0/+1
| | | | | | Bug: 10430748 Change-Id: I26e1208b38f40808ff59e3976f5c4a76efa15b4c
* 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
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-09-1947-24/+120
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-09-1947-24/+120
| | | | | | | | | | | | | | | Change-Id: I14087e2afde009daca03e6005fab8043d36c7e0c Auto-generated-cl: translation import
* | | Merge "Fix drawable location." into gb-ub-photos-carlsbadRuben Brunk2013-09-191-0/+0
|\ \ \
| * | | Fix drawable location.Ruben Brunk2013-09-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10430748 - Drawable wasn't included when building from klp-dev. Change-Id: I85e57eebbab3a25e18e3fd6738ffa43bdd61f974
* | | | Add crop activitynicolasroard2013-09-1920-2/+3982
| | | | | | | | | | | | | | | | | | | | | | | | bug:10367125 Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
* | | | Use contentObserver to refresh the data when dirty.ztenghui2013-09-193-33/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle another setDataSource exception. Remove the old work around for refreshing after editing. bug:10390298 Change-Id: I8777364b96c86eeaf5581a96163aab823cd4b438
* | | | Bring back NFC beam support to filmstripMangesh Ghiware2013-09-192-7/+48
|/ / / | | | | | | | | | | | | Bug: 10805211 Change-Id: I457d47625c69fcdaba663e53f46d461d29c7cb92
* | | Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbadRuben Brunk2013-09-198-28/+86
|\ \ \ | |_|/ |/| |
| * | Adding gcam module to Camera2 app.Ruben Brunk2013-09-188-28/+86
| |/ | | | | | | | | | | Bug: 10430748 Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
* | Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbadMangesh Ghiware2013-09-196-1/+9
|\ \ | |/ |/|
| * Make Up button in filmstrip go to Gallery.Mangesh Ghiware2013-09-186-1/+9
| | | | | | | | | | Bug: 10748904 Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9
* | Fix various message issuesSascha Haeberling2013-09-181-13/+19
|/ | | | | | | | | | Bug: 10568697 Bug: 10589224 Bug: 10561095 Bug: 10589353 Bug: 10570925 Change-Id: I1affdf37d74bef37e099c70775f669ee0ff33acf
* Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-1821-2128/+131
| | | | | | | | | Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
* Adding Hideybar support for K and up.Sascha Haeberling2013-09-182-22/+57
| | | | | | Bug: 10723047 Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a
* Merge "Delete the captured video if cancel in review." into ↵ztenghui2013-09-181-1/+4
|\ | | | | | | gb-ub-photos-carlsbad
| * Delete the captured video if cancel in review.ztenghui2013-09-171-1/+4
| | | | | | | | | | | | | | | | In capture intent case, video get inserted all the time before review. So if cancelled in review mode, the captured video should be deleted. bug:8897671 Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7
* | Fall back to Photo module if stores index is illegal.Sascha Haeberling2013-09-171-8/+7
| | | | | | | | | | | | Bug: 10805249 Change-Id: Iace590af34cf646abf7af74b498520d686c04511
* | Merge "Don't crash the app if camera is not available." into ↵Sascha Haeberling2013-09-171-0/+3
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Don't crash the app if camera is not available.Sascha Haeberling2013-09-171-1/+4
| | | | | | | | | | | | | | | | | | Bug: 10747001 Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
* | | Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbadSascha Haeberling2013-09-171-0/+24
|\ \ \
| * | | Adding a simple done handler interface.Sascha Haeberling2013-09-161-0/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | Bug: 10747001 Needed by http://ag/360619 Change-Id: I942cb601391a8cdd2c30ea152415f56d38fd0918
* | | Merge "Fix camera controls rotation for secure camera" into ↵Doris Liu2013-09-171-30/+31
|\ \ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | Fix camera controls rotation for secure cameraDoris Liu2013-09-171-30/+31
| | | | | | | | | | | | | | | | | | | | Bug: 8878379 Change-Id: I80b06d98010dbed14a46994f365d1fbb9aa8ba49
* | | | Merge "Show dialog when camera device is not connected." into ↵Angus Kong2013-09-179-103/+265
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | | Show dialog when camera device is not connected.Angus Kong2013-09-179-103/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10726516 Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
* | | | | Merge "Use a new Intent to work around issues in framework" into ↵ztenghui2013-09-171-6/+34
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | gb-ub-photos-carlsbad
| * | | Use a new Intent to work around issues in frameworkztenghui2013-09-171-6/+34
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Framework didn't update the action provider if reusing the intent object. The work around is creating new intents here. bug:10713267 Change-Id: Iee64e84e191c8c2c2377fb5b9b95a91dae3c445c
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-09-1735-282/+142
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1635-282/+142
| | | | | | | | | | | | | | | | | | | | Change-Id: Iab05e7410b6829ad7934d71024fee3e1e2d77f8f Auto-generated-cl: translation import
* | | | Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbadDoris Liu2013-09-174-14/+66
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix zoom for images with orientation tagDoris Liu2013-09-164-14/+66
| | |/ | |/| | | | | | | | | | Bug: 10780042 Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318
* | | Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbadAngus Kong2013-09-171-29/+60
|\ \ \
| * | | Set correct alpha for views in filmstrip.Angus Kong2013-09-161-29/+60
| | |/ | |/| | | | | | | | | | | | | bug:10713813 Change-Id: I2715b7c3ecb2e0c995e8f66e710c91561e9cf231
* | | Add HQ and HD strings.Sascha Haeberling2013-09-161-0/+4
| |/ |/| | | | | | | | | Bug: 10785988 Change-Id: Idc76e1888cb91d3ec6b56657f38f7422a2df7e43
* | Merge "Fix flicker when zooming images smaller than screen" into ↵Doris Liu2013-09-161-1/+3
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Fix flicker when zooming images smaller than screenDoris Liu2013-09-161-1/+3
| | | | | | | | | | | | | | | Bug: 10733300 Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
* | | Avoid expensive O(n) main-thread operation when adding Photo Sphere.Sascha Haeberling2013-09-162-21/+114
| |/ |/| | | | | | | | | Bug: 10747001 Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda
* | Import translations. DO NOT MERGEBaligh Uddin2013-09-1447-0/+328
|/ | | | | Change-Id: I66cd67cee8d92b6c594ad9f19d217a1a4cceae44 Auto-generated-cl: translation import
* Don't show menu/indicators in wide-angle mode.Angus Kong2013-09-131-1/+3
| | | | | | bug:10674078 Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f
* Merge "Fix potential deadlock while rendering the preview." into ↵Sascha Haeberling2013-09-131-2/+4
|\ | | | | | | gb-ub-photos-carlsbad
| * Fix potential deadlock while rendering the preview.Sascha Haeberling2013-09-131-2/+4
| | | | | | | | | | | | Bug: 10748013 Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502
* | Merge "Always leave full-screen when swip from camera." into ↵Angus Kong2013-09-131-9/+6
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Always leave full-screen when swip from camera.Angus Kong2013-09-121-9/+6
| | | | | | | | | | | | bug:10714779 Change-Id: Ifa10f151974ac0598a0c27751e23c77d525d332e
* | Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbadAngus Kong2013-09-131-9/+43
|\ \
| * | Avoid flickering after swipe to delete.Angus Kong2013-09-121-9/+43
| | | | | | | | | | | | | | | | | | bug:10624385 Change-Id: Id4d65a391b2d13a5d6cc08ae9c1b787610c94c46