summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
* | | Add support for remote shutter control via broadcast intents.Dan Aminzade2013-08-141-64/+97
|/ /
* | Merge "Handle unexpected exceptions when loading videos." into gb-ub-photos-c...Angus Kong2013-08-142-24/+35
|\ \
| * | Handle unexpected exceptions when loading videos.Angus Kong2013-08-142-24/+35
| |/
* | Merge "Copy over libjni_mosaic from Camera. We need to support the SRI pano m...Sascha Haeberling2013-08-1481-0/+26185
|\ \
| * | Copy over libjni_mosaic from Camera. We need to support the SRI panoSascha Haeberling2013-08-1481-0/+26185
| |/
* / Add back DisableCameraReceiverMangesh Ghiware2013-08-141-0/+6
|/
* 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
* | Fix camera preview stopped after onResume().Angus Kong2013-08-139-173/+134
* | Fix view jumps when action bar is hidingztenghui2013-08-131-0/+1
* | Merge "Don't take a snapshot if video recording is not in progress." into gb-...Sascha Haeberling2013-08-131-3/+5
|\ \
| * | Don't take a snapshot if video recording is not in progress.Sascha Haeberling2013-08-131-3/+5
* | | 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
* | | 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
* | | Merge "Add the menu items back" into gb-ub-photos-carlsbadztenghui2013-08-132-0/+193
|\| |
| * | Add the menu items backztenghui2013-08-132-0/+193
| |/
* | Merge "Check for device support before taking video snapshots" into gb-ub-pho...Doris Liu2013-08-131-17/+24
|\ \ | |/ |/|
| * Check for device support before taking video snapshotsDoris Liu2013-08-131-17/+24
* | Merge "Remove old video camera icon and label from Camera2" into gb-ub-photos...Doris Liu2013-08-133-3/+0
|\ \ | |/ |/|
| * Remove old video camera icon and label from Camera2Doris Liu2013-08-133-3/+0
* | Remove Refocus from Camera UI.Sascha Haeberling2013-08-132-13/+1
* | 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
* | Add local data types.Angus Kong2013-08-125-27/+77
* | Don't return null if there's no images to load.Angus Kong2013-08-121-4/+7
|/
* Don't set mImages to null, as we call .size() later.Sascha Haeberling2013-08-121-1/+1
* Update app name to "Camera" before merging to KLP.Sascha Haeberling2013-08-122-6/+3
* 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
* | 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
* | | Fix NPE after capture when camera roll is empty.Angus Kong2013-08-091-11/+2
|/ /
* | 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
* | | Use PopupWindow for settings popupDoris Liu2013-08-095-86/+75
|/ /
* / Fix DataAdapter wrapper classes callback mechanism.Angus Kong2013-08-092-6/+44
|/
* Merge "Refactor data/LocalData." into gb-ub-photos-carlsbadAngus Kong2013-08-076-713/+764
|\
| * Refactor data/LocalData.Angus Kong2013-08-076-713/+764
* | Changes required for building GoogleCamera.Sascha Haeberling2013-08-072-7/+39
|/
* Remove refocus icon if it's not enabled or present.Sascha Haeberling2013-08-063-14/+71
* Add .mk files for Camera2.Sascha Haeberling2013-08-064-0/+177
* This adds the following four CLs to Camera2:Sascha Haeberling2013-08-0620-289/+794
* Remove two more .mk files. We will add CleanSpec.mk back later.Sascha Haeberling2013-08-062-57/+0
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-06806-103203/+1081
* Remove all .mk files from the cloned Camera2 until the project isSascha Haeberling2013-08-066-210/+0
* Merge tests/exiftool_parser/ from platform/packages/apps/Gallery2 to tests/ex...Qiwen Zhao2013-08-051-0/+90
|\