summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Implent show-on-map functionality.Sascha Haeberling2013-08-157-27/+102
| | | | | | | | | | | | | | | | | | Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view. Bug: 10346208 Bug: 10330505 Change-Id: Idaeec207bcc0e7311fa3b651868515ccea81d083
* | Merge "Brings back the details menu with most EXIF data in it. Some are ↵Sascha Haeberling2013-08-159-18/+636
|\ \ | | | | | | | | | still missing and will come back later." into gb-ub-photos-carlsbad
| * | Brings back the details menu with most EXIF data in it.Sascha Haeberling2013-08-159-18/+636
| | | | | | | | | | | | | | | | | | | | | | | | Some are still missing and will come back later. Bug: 10330505 Change-Id: I7bc44b19fac5b47557d5feae3ed969040ac3ae9b
* | | Defining broadcast intent strings as constants in CameraUtil.java.Dan Aminzade2013-08-152-4/+14
|/ / | | | | | | | | | | | | | | For now I'm leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to Camera.java. Change-Id: Ia198b843245b70d7378e1ea81ecb8b7983486446
* | Single tap to full screen mode.Angus Kong2013-08-141-18/+5
| | | | | | | | | | | | bug:10308911 Change-Id: Ia3213782091eafe6a5683a931dea1ae212e79ba3
* | Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbadAngus Kong2013-08-141-5/+25
|\ \
| * | Make current view center in filmstrip.Angus Kong2013-08-141-5/+25
| | | | | | | | | | | | | | | | | | bug:10096746 Change-Id: I458a3f1b1a2c78239e1cfaa91d6d5e1cec19507e
* | | Add support for remote shutter control via broadcast intents.Dan Aminzade2013-08-141-64/+97
|/ / | | | | | | | | | | | | | | | | Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. This change resolves b/10185077. Change-Id: I1e38039874b74460f5c815e9d2672789691e9e2f
* | Merge "Handle unexpected exceptions when loading videos." into ↵Angus Kong2013-08-142-24/+35
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Handle unexpected exceptions when loading videos.Angus Kong2013-08-142-24/+35
| |/ | | | | | | | | | | | | bug:10313671 bug:9757517 Change-Id: I8cb922599c4185a585f90007c3975841d14e179a
* | Merge "Copy over libjni_mosaic from Camera. We need to support the SRI pano ↵Sascha Haeberling2013-08-1481-0/+26185
|\ \ | | | | | | | | | mode for Carlsbad." into gb-ub-photos-carlsbad
| * | Copy over libjni_mosaic from Camera. We need to support the SRI panoSascha Haeberling2013-08-1481-0/+26185
| |/ | | | | | | | | | | mode for Carlsbad. Change-Id: Id14e64d8248236e8170c12cfca2cbf2ca952e993
* / Add back DisableCameraReceiverMangesh Ghiware2013-08-141-0/+6
|/ | | | | Bug: 10314435 Change-Id: Ic8ba05e6bfecfff365b2fd759d7669c1015a3845
* Merge "Add activity-alias for Camera." into gb-ub-photos-carlsbadMangesh Ghiware2013-08-141-4/+12
|\
| * Add activity-alias for Camera.Mangesh Ghiware2013-08-131-4/+12
| | | | | | | | | | | | | | Similar to the one in Gallery2 manifest. Bug: 10312966 Change-Id: I5325f8cfeba2a3825cd5604d4fee7c209067aba1
* | Fix camera preview stopped after onResume().Angus Kong2013-08-139-173/+134
| | | | | | | | | | | | | | | | | | | | | | This fix is for the blank camera preview blank after onPause() -> onResume(). 1. Refined camera start up procedure by removing redundant camera startup thread. 2. Cleanup unused calls after aparted from gallery. bug:10189998 Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
* | Fix view jumps when action bar is hidingztenghui2013-08-131-0/+1
| | | | | | | | | | | | bug:10245009 Change-Id: Ie596132dfc7790ff371d032701475aa742bd31fa
* | Merge "Don't take a snapshot if video recording is not in progress." into ↵Sascha Haeberling2013-08-131-3/+5
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Don't take a snapshot if video recording is not in progress.Sascha Haeberling2013-08-131-3/+5
| | | | | | | | | | | | | | | | | | Bug:10312841 Change-Id: Ie6931d054089d0825e7a57206a8de129a79b741f
* | | Merge "Clean up unused code." into gb-ub-photos-carlsbadSascha Haeberling2013-08-133-40/+1
|\| |
| * | Clean up unused code.Sascha Haeberling2013-08-133-40/+1
| | | | | | | | | | | | Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221
* | | Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbadztenghui2013-08-132-0/+3
|\ \ \ | |/ / |/| |
| * | Hide the actionbar and title at the beginningztenghui2013-08-132-0/+3
| | | | | | | | | | | | | | | | | | bug:10245009 Change-Id: I39640e9f7add0c8ae20257dd5c71cefd4a927a0e
* | | Merge "Add the menu items back" into gb-ub-photos-carlsbadztenghui2013-08-132-0/+193
|\| |
| * | Add the menu items backztenghui2013-08-132-0/+193
| |/ | | | | | | | | | | bug:10245009 Change-Id: I4e11e0cd64800bd9c07158d1a46ea5765ba51d15
* | Merge "Check for device support before taking video snapshots" into ↵Doris Liu2013-08-131-17/+24
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Check for device support before taking video snapshotsDoris Liu2013-08-131-17/+24
| | | | | | | | | | Bug: 9496097 Change-Id: I6f5d0489848b583fac3b1fd3b605351002be08ba
* | Merge "Remove old video camera icon and label from Camera2" into ↵Doris Liu2013-08-133-3/+0
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Remove old video camera icon and label from Camera2Doris Liu2013-08-133-3/+0
| | | | | | | | | | Bug: 10296343 Change-Id: I6c6f130f86b4206d6b9ef322c76e6bdbe81aa57e
* | Remove Refocus from Camera UI.Sascha Haeberling2013-08-132-13/+1
| | | | | | | | | | | | Bug:10073814 Change-Id: I023c7f61463690b02492705cedec8c74159c515d
* | Merge "Fix video capture intent handling" into gb-ub-photos-carlsbadDoris Liu2013-08-135-15/+54
|\ \ | |/ |/|
| * Fix video capture intent handlingDoris Liu2013-08-135-15/+54
| | | | | | | | | | | | Bug: 10296343 Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
* | Add local data types.Angus Kong2013-08-125-27/+77
| | | | | | | | | | | | | | | | We need local data types to generate different menus. bug:10245009 Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
* | Don't return null if there's no images to load.Angus Kong2013-08-121-4/+7
|/ | | | | | bug:10294250 Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
* Don't set mImages to null, as we call .size() later.Sascha Haeberling2013-08-121-1/+1
| | | | | | Bug: 10293573 Change-Id: I5fab2bc4fe355c4c26dcab9b6b71ff14e7216502
* Update app name to "Camera" before merging to KLP.Sascha Haeberling2013-08-122-6/+3
| | | | Change-Id: Icbd776f5e2b07464de94b41081358996920eafcf
* Merge "Add the basic action bar back." into gb-ub-photos-carlsbadztenghui2013-08-124-46/+13
|\
| * Add the basic action bar back.ztenghui2013-08-094-46/+13
| | | | | | | | | | | | | | | | Remove outdated styles. bug:10245009 Change-Id: I1ab6e6ea7c3e5c4157951203209b573dd2edda88
* | Merge "Clean up Gallery codes." into gb-ub-photos-carlsbadAngus Kong2013-08-1082-8647/+234
|\ \
| * | Clean up Gallery codes.Angus Kong2013-08-0982-8647/+234
| | | | | | | | | | | | | | | | | | bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
* | | Fix NPE after capture when camera roll is empty.Angus Kong2013-08-091-11/+2
|/ / | | | | | | | | | | | | | | Use empty array instead of null. bug:10264304 Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
* | Merge "Add camera-related tests back." into gb-ub-photos-carlsbadSascha Haeberling2013-08-0921-0/+1796
|\ \
| * | Add camera-related tests back.Sascha Haeberling2013-08-0921-0/+1796
| | | | | | | | | | | | Change-Id: I2213618fe3b2d4ba776c5f1f94aca330a785df1a
* | | Use PopupWindow for settings popupDoris Liu2013-08-095-86/+75
|/ / | | | | | | | | Bug:10261902 Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
* / Fix DataAdapter wrapper classes callback mechanism.Angus Kong2013-08-092-6/+44
|/ | | | | | Also to fix FilmStripView to avoid NPE before data is loaded. Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
* Merge "Refactor data/LocalData." into gb-ub-photos-carlsbadAngus Kong2013-08-076-713/+764
|\
| * Refactor data/LocalData.Angus Kong2013-08-076-713/+764
| | | | | | | | | | | | Make the design more easily understood. Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
* | Changes required for building GoogleCamera.Sascha Haeberling2013-08-072-7/+39
|/ | | | Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
* Remove refocus icon if it's not enabled or present.Sascha Haeberling2013-08-063-14/+71
| | | | Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8
* Add .mk files for Camera2.Sascha Haeberling2013-08-064-0/+177
| | | | Change-Id: I0678c1b12f40f6dfd76d7589f61d18e99997394f
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 11:01:09 +0000