summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Expand)AuthorAgeFilesLines
* Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carl...Doris Liu2013-06-115-2/+19
|\
| * Disable zoom when camera does not support zoomDoris Liu2013-06-115-2/+19
* | Fix build.Angus Kong2013-06-111-1/+1
* | Use setPreviewFpsRange instead.Angus Kong2013-06-113-5/+23
|/
* Add enable/disable swiping to filmstripDoris Liu2013-06-067-11/+27
* Merge "Play video from flim strip." into gb-ub-photos-carlsbadAngus Kong2013-06-055-26/+63
|\
| * Play video from flim strip.Angus Kong2013-06-045-26/+63
* | Add interface for swipe checking.Angus Kong2013-06-053-0/+22
|/
* Merge "Get new camera activity up to date" into gb-ub-photos-carlsbadDoris Liu2013-06-046-178/+122
|\
| * Get new camera activity up to dateDoris Liu2013-06-036-178/+122
* | Fix pie menu button disappearingDoris Liu2013-06-031-1/+1
* | Merge "Add secure camera support." into gb-ub-photos-carlsbadAngus Kong2013-06-043-42/+139
|\ \
| * | Add secure camera support.Angus Kong2013-06-033-42/+139
| |/
* / Add play icon for videos.Angus Kong2013-06-031-6/+22
|/
* Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbadDoris Liu2013-06-037-77/+73
|\
| * Add recent changes to new photo moduleDoris Liu2013-05-317-77/+73
* | Add newly taken photos/videos to film strip.Angus Kong2013-05-314-4/+61
|/
* Merge "Adjust data id even if it's not currently used." into gb-ub-photos-car...Angus Kong2013-05-311-5/+11
|\
| * Adjust data id even if it's not currently used.Angus Kong2013-05-301-5/+11
* | Improve gesture handlingDoris Liu2013-05-319-237/+137
* | Merge "Translate the first/last view too." into gb-ub-photos-carlsbadAngus Kong2013-05-311-5/+9
|\ \
| * | Translate the first/last view too.Angus Kong2013-05-301-5/+9
| |/
* | Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbadAngus Kong2013-05-311-1/+2
|\ \
| * | Don't use the same drawable for every view.Angus Kong2013-05-301-1/+2
| |/
* / Fix mistakenly reversed order in FilmStripView.Angus Kong2013-05-301-2/+2
|/
* am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
|\
| * Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
| |\
| | * Add HTC One picture resolutionsMichael Kolb2013-05-301-2/+23
* | | am a1db2653: Dismiss settings when showing popup in Video mode.Angus Kong2013-05-301-0/+1
|\| |
| * | Dismiss settings when showing popup in Video mode.Angus Kong2013-05-291-0/+1
* | | Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbadAngus Kong2013-05-292-37/+138
|\ \ \
| * | | Add UI for insertion in FilmStripView.Angus Kong2013-05-282-37/+138
* | | | Removed unused handling for intent extras in editor.Ruben Brunk2013-05-282-3/+4
|/ / /
* | | am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-pho...Doris Liu2013-05-281-4/+4
|\| |
| * | Change the order of exposure compensationDoris Liu2013-05-241-4/+4
| |/
* | Merge "Fix/simplify comparator of LocalData." into gb-ub-photos-carlsbadAngus Kong2013-05-231-9/+11
|\ \
| * | Fix/simplify comparator of LocalData.Angus Kong2013-05-231-9/+11
* | | Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbadAngus Kong2013-05-231-83/+122
|\ \ \
| * | | Refactor to add FilmStripView.Controller.Angus Kong2013-05-221-83/+122
| |/ /
* | | am 80a3d636: Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-223-1/+37
|\ \ \ | |/ / |/| / | |/
| * Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-213-1/+37
* | Keep camera preview in view hierarchy.Angus Kong2013-05-211-5/+29
* | Fix off-position issue after changing orientationAngus Kong2013-05-211-93/+100
* | Fix jitter in FilmStripView.Angus Kong2013-05-201-14/+51
* | Add remove UI in FilmStripViewAngus Kong2013-05-165-58/+257
* | Add new camera activity back and fix build errorsDoris Liu2013-05-1612-3/+7226
* | am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-...Michael Kolb2013-05-151-1/+1
|\|
| * Merge "Correct label position after rotation" into gb-ub-photos-bryceMichael Kolb2013-05-151-1/+1
| |\
| | * Correct label position after rotationMichael Kolb2013-05-141-1/+1
* | | Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbadAngus Kong2013-05-153-356/+524
|\ \ \