summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-11-1155-390/+195
* merge in release branch changes (no-op).Ed Heyl2013-11-080-0/+0
|\
| * Add GCam progress indicator.Sascha Haeberling2013-11-073-13/+100
| * hide preview cover on arrival of new preview data if hiddenAndy Huibers2013-11-073-4/+12
| * Fix photo mode is getting stuck in a single CameraState.Erin Dahlgren2013-11-071-6/+8
| * Show chooser on EDIT intents that have no activity for action.Erin Dahlgren2013-11-071-1/+6
| * Parallelize opening the camera with view handling in photo mode.Erin Dahlgren2013-11-072-80/+192
| * Decouple the visibility check for system UI from action barztenghui2013-11-071-5/+10
| * merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-070-0/+0
| |\
| | * Don't crash Photo Sphere on back button press in filmstrip.Sascha Haeberling2013-11-061-2/+4
| | * merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-060-0/+0
| | |\
| | | * merge in klp-mr1-release history after reset to klp-devThe Android Automerger2013-11-050-0/+0
| | | |\
| | | | * Check for media service being present before capture.Sascha Haeberling2013-11-041-0/+1
* | | | | am cbd8267e: Add logging to various actionsSeth Raphael2013-11-078-4/+105
|\ \ \ \ \
| * | | | | Add logging to various actionsSeth Raphael2013-11-078-4/+105
* | | | | | am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferenc...Ruben Brunk2013-11-071-7/+15
|\| | | | |
| * | | | | Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb...Ruben Brunk2013-11-081-7/+15
| |\ \ \ \ \
| | * | | | | Ensure mOpenCameraThread has been setup before dereferencing.Ruben Brunk2013-11-071-7/+15
* | | | | | | am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbadSascha Haeberling2013-11-073-13/+100
|\| | | | | |
| * | | | | | Merge "Add GCam progress indicator." into gb-ub-photos-carlsbadSascha Haeberling2013-11-073-13/+100
| |\ \ \ \ \ \
| | * | | | | | Add GCam progress indicator.Sascha Haeberling2013-11-073-13/+100
| | |/ / / / /
* | | | | | | am fccf83bd: hide preview cover on arrival of new preview data if hiddenAndy Huibers2013-11-073-4/+12
|\| | | | | |
| * | | | | | hide preview cover on arrival of new preview data if hiddenAndy Huibers2013-11-073-4/+12
| |/ / / / /
* | | | | | am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState."...Erin Dahlgren2013-11-071-6/+8
|\| | | | |
| * | | | | Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-p...Erin Dahlgren2013-11-071-6/+8
| |\ \ \ \ \
| | * | | | | Fix photo mode is getting stuck in a single CameraState.Erin Dahlgren2013-11-071-6/+8
* | | | | | | am 05a04924: Show chooser on EDIT intents that have no activity for action.Erin Dahlgren2013-11-071-1/+6
|\| | | | | |
| * | | | | | Show chooser on EDIT intents that have no activity for action.Erin Dahlgren2013-11-071-1/+6
| |/ / / / /
* | | | | | am 7e6e947f: Merge "Parallelize opening the camera with view handling in phot...Erin Dahlgren2013-11-072-80/+192
|\| | | | |
| * | | | | Merge "Parallelize opening the camera with view handling in photo mode." into...Erin Dahlgren2013-11-072-80/+192
| |\ \ \ \ \
| | * | | | | Parallelize opening the camera with view handling in photo mode.Erin Dahlgren2013-11-072-80/+192
* | | | | | | am 9070def9: Merge "Decouple the visibility check for system UI from action b...ztenghui2013-11-071-5/+10
|\| | | | | | | |_|/ / / / |/| | | | |
| * | | | | Merge "Decouple the visibility check for system UI from action bar" into gb-u...ztenghui2013-11-071-5/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Decouple the visibility check for system UI from action barztenghui2013-11-061-5/+10
* | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-11-0755-239/+480
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-11-0655-239/+480
* | | | | | | am eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip.Sascha Haeberling2013-11-061-2/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Don't crash Photo Sphere on back button press in filmstrip.Sascha Haeberling2013-11-061-2/+4
* | | | | | | am 189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-ph...ztenghui2013-11-062-0/+3
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Merge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbadztenghui2013-11-062-0/+3
| |\| | | |
| | * | | | Fix the RTL layout in the app's manifest.ztenghui2013-11-052-0/+3
* | | | | | am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carl...Erin Dahlgren2013-11-061-2/+1
|\| | | | | | |_|/ / / |/| | | |
| * | | | Merge "Make image editor intent general." into gb-ub-photos-carlsbadErin Dahlgren2013-11-061-2/+1
| |\ \ \ \
| | * | | | Make image editor intent general.Erin Dahlgren2013-11-051-2/+1
| | |/ / /
* | | | | am 2bcb8d1f: add \'capturing\' string for in process indicatorsAlan Newberger2013-11-051-0/+3
|\| | | |
| * | | | add 'capturing' string for in process indicatorsAlan Newberger2013-11-051-0/+3
* | | | | am 404d7eb0: Merge "camera: Ensure camera release for lockscreen transition."...Ruben Brunk2013-11-051-1/+8
|\| | | |
| * | | | Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-p...Ruben Brunk2013-11-061-1/+8
| |\ \ \ \
| | * | | | camera: Ensure camera release for lockscreen transition.Ruben Brunk2013-11-051-1/+8
| | |/ / /
* | | | | am d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-pho...Doris Liu2013-11-051-4/+5
|\| | | |