summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platf...staging/cm-12.1Steve Kondik2015-03-2444-647/+1319
|\
| * Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" i...Alan Newberger2014-11-042-2/+11
| |\
| | * Relax aspect ratio matching tolerance for devices with 1.347 ratiosAlan Newberger2014-11-042-2/+11
| * | move size parameter setting before other settingsAlan Newberger2014-11-041-1/+6
| |/
| * Forcefully drop 4k recording from pre-L releases.Sascha Haeberling2014-10-291-1/+16
| * Remove additional dependencies on FloatMathSascha Haeberling2014-10-281-2/+1
| * Fix wear interaction of CaptureModuleSascha Haeberling2014-10-272-6/+6
| * Merge "Volantis Device Identifier Helper" into ub-camera-glacierI-Jong Lin2014-10-271-0/+3
| |\
| | * Volantis Device Identifier HelperI-Jong Lin2014-10-271-0/+3
| * | Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" in...Spike Sprague2014-10-271-4/+8
| |\ \
| | * | Prevent unnecessary setVisibility calls in Filmstrip while zoomingSpike Sprague2014-10-271-4/+8
| | |/
| * / Align id selection from QueryTask to sort order from Media queryAlan Newberger2014-10-272-6/+32
| |/
| * Merge "When option buttons are disabled, make sure the HDR / HDR+ button has ...Spike Sprague2014-10-242-8/+33
| |\
| | * When option buttons are disabled, make sure the HDR / HDR+ button has the cor...Spike Sprague2014-10-232-8/+33
| * | Introduce ActionCallback for LocalData items.Sascha Haeberling2014-10-239-30/+75
| |/
| * Merge "Clean up orientation logging" into ub-camera-glacierAlan Newberger2014-10-231-8/+4
| |\
| | * Clean up orientation loggingAlan Newberger2014-10-221-8/+4
| * | Merge "Stop activity leaks" into ub-camera-glacierSascha Haeberling2014-10-226-86/+148
| |\ \
| | * | Stop activity leaksSascha Haeberling2014-10-226-86/+148
| * | | Merge "Null check for buildItemFromData" into ub-camera-glacierAlan Newberger2014-10-221-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Null check for buildItemFromDataAlan Newberger2014-10-221-0/+4
| | |/
| * / Check for null when deleting preference groupsAlan Newberger2014-10-221-0/+8
| |/
| * Increase VERBOSE logging for PhotoModule orientation useAlan Newberger2014-10-202-0/+12
| * Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacierI-Jong Lin2014-10-201-7/+14
| |\
| | * Secure Camera App survives phone unlock screenI-Jong Lin2014-10-201-7/+14
| * | Merge "Catch exceptions in settings remove helpers" into ub-camera-glacierAlan Newberger2014-10-201-3/+18
| |\ \
| | * | Catch exceptions in settings remove helpersAlan Newberger2014-10-201-3/+18
| * | | Merge "Button fix for torch when no flash available in hw" into ub-camera-gla...I-Jong Lin2014-10-201-1/+7
| |\ \ \ | | |/ / | |/| |
| | * | Button fix for torch when no flash available in hwI-Jong Lin2014-10-201-1/+7
| * | | Don't release resources until camera is closed.Sascha Haeberling2014-10-171-2/+2
| |/ /
| * | Merge "disable startup shimmy on sd card error" into ub-camera-glacierSpike Sprague2014-10-162-1/+37
| |\ \
| | * | disable startup shimmy on sd card errorSpike Sprague2014-10-152-1/+37
| * | | Show capturing UI before review UI in intent countdown timerAlan Newberger2014-10-152-10/+6
| * | | Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacierI-Jong Lin2014-10-151-7/+12
| |\ \ \
| | * | | Fix for crash when PhotoApp deletes last Cam picI-Jong Lin2014-10-151-7/+12
| | | |/ | | |/|
| * | | Merge "Make string comparison robust against null values." into ub-camera-gla...Sascha Haeberling2014-10-151-1/+1
| |\ \ \
| | * | | Make string comparison robust against null values.Sascha Haeberling2014-10-151-1/+1
| * | | | Merge "Log camera exception via UsageStatistics." into ub-camera-glacierSenpo Hu2014-10-141-5/+15
| |\ \ \ \
| | * | | | Log camera exception via UsageStatistics.Senpo Hu2014-10-141-5/+15
| | |/ / /
| * | | | Merge "disable shutter button as soon as possible to avoid double shutter pre...Spike Sprague2014-10-141-6/+8
| |\ \ \ \
| | * | | | disable shutter button as soon as possibleSpike Sprague2014-10-141-6/+8
| | | |/ / | | |/| |
| * | | | Merge "Revert "Make CameraDataAdapter background new data loading and post to...Alan Newberger2014-10-142-86/+51
| |\ \ \ \
| | * | | | Revert "Make CameraDataAdapter background new data loading and post to listener"Alan Newberger2014-10-142-86/+51
| * | | | | Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacierAlan Newberger2014-10-141-6/+16
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Migrate Settings Fragment to use argumentsAlan Newberger2014-10-141-6/+16
| * | | | | Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." in...Senpo Hu2014-10-141-0/+4
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Prevent NullPointerException of PhotoModule in quick resume-pause.Senpo Hu2014-10-141-0/+4
| * | | | | Preview vs Video Camera Resolution MismatchI-Jong Lin2014-10-142-6/+58
| | |_|_|/ | |/| | |
| * | | | Merge "Don't re-open the camera if already open" into ub-camera-glacierPuneet Lall2014-10-141-0/+6
| |\ \ \ \
| | * | | | Don't re-open the camera if already openPuneet Lall2014-10-131-0/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 20:58:55 +0000