summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add crop activitynicolasroard2013-09-1912-2/+3830
| | | | | | 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-195-28/+52
|\
| * Adding gcam module to Camera2 app.Ruben Brunk2013-09-185-28/+52
| | | | | | | | | | | | Bug: 10430748 Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
* | Make Up button in filmstrip go to Gallery.Mangesh Ghiware2013-09-182-1/+8
|/ | | | | Bug: 10748904 Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9
* 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 "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
* | 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
* 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
* | | Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbadztenghui2013-09-131-1/+3
|\ \ \
| * | | Fix crash due to a hole in setDataSource.ztenghui2013-09-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setDataSource() somehow throws a RuntimeException instead of IllegalArgumentException when seeing unsupported video file. bug:10732664 Change-Id: I79ab1f1afd8750bb37df0c8fc9448dbb2e00230a
* | | | Fix DeadLock in TinyPlanet.Sascha Haeberling2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10393598 Now that we acquire the lock inside doInBackground, we need to make sure to run the AsyncTasks in parallel. Change-Id: If253f375d56c352c30076f00cf923dfa521f2db4
* | | | Bring back tiny planet to the Camera filmstripSascha Haeberling2013-09-127-30/+1109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10393598 The native code and XmpUtil are mostly 1:1 copies from Gallery2. The UI is new and should work on all form factors. Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
* | | | Keep undo bar around until there is user interacitonDoris Liu2013-09-122-29/+112
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10678578 Bug: 10674009 Also removed the use of withEndAction() call because it was introduced in API 16, whereas we need to be compatible with API 14+ Change-Id: I785770ae9a083f88056e94fc5378daf8ebc6dc6e
* | | Merge "When current data is preview, don't show the action bar." into ↵ztenghui2013-09-122-9/+30
|\| | | |/ |/| | | gb-ub-photos-carlsbad
| * When current data is preview, don't show the action bar.ztenghui2013-09-122-9/+30
| | | | | | | | | | | | bug:10678458 Change-Id: Ia48ca694ddca47438338e7223e9fa19c2c65dd5d
* | Show captured image rather than frozen preview for capture intentDoris Liu2013-09-112-6/+31
|/ | | | | Bug: 10570887 Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
* Fix the flash mode transition in video modeztenghui2013-09-118-97/+87
| | | | | | | | | | onSwitchMode is wrongly overloaded, now is fixed. Basically, onCurrentDataChanged will handle the switching in and out of Camera. onDataFullScreenChange will handle full screen change on non-preview data. bug:10610967 Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
* Merge "Flinging back should stop at the first photo first." into ↵Angus Kong2013-09-101-11/+30
|\ | | | | | | gb-ub-photos-carlsbad
| * Flinging back should stop at the first photo first.Angus Kong2013-09-101-11/+30
| | | | | | | | | | | | bug:10634016 Change-Id: I44e715268b913902a444c977c136d1e0381b3833
* | Hide zoom view when going to full screenDoris Liu2013-09-101-3/+5
|/ | | | | | Bug: 10654903 Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f
* Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbadAngus Kong2013-09-101-77/+84
|\
| * Fix images being off-center in filmstrip.Angus Kong2013-09-091-77/+84
| | | | | | | | | | | | | | bug:10609827 bug:10650966 Change-Id: Ie06beaeb7c6a616d5d7ca751cfaa65a64844332c
* | Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbadDoris Liu2013-09-101-0/+2
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 03:43:30 +0000