summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-gla...Andy Huibers2014-08-263-2/+7
|\
| * Enable Face rectangles for debugging.Andy Huibers2014-08-253-2/+7
| * Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-08-2255-8/+115
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-1855-8/+115
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-2470-183/+115
* | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-08-222-8/+6
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-08-182-8/+6
* | | | am ba97d192: animate filmstrip bottom button bar in and out from the bottom o...Spike Sprague2014-08-211-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | animate filmstrip bottom button bar in and outSpike Sprague2014-08-211-1/+2
* | | | am 5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into u...Senpo Hu2014-08-213-10/+11
|\| | |
| * | | Merge "Change Shamu's default video resolution setting." into ub-camera-glacierSenpo Hu2014-08-203-10/+11
| |\ \ \
| | * | | Change Shamu's default video resolution setting.Senpo Hu2014-08-203-10/+11
* | | | | am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule...Alan Newberger2014-08-191-1/+0
|\| | | |
| * | | | Remove extra parent mode from array, and make PhotoModule scope string publicAlan Newberger2014-08-181-1/+0
| |/ / /
* | / / am a675af27: Merge "change settings to use dark theme." into ub-camera-glacierSpike Sprague2014-08-182-2/+2
|\| | | | |/ / |/| |
| * | Merge "change settings to use dark theme." into ub-camera-glacierSpike Sprague2014-08-162-2/+2
| |\ \ | | |/ | |/|
| | * change settings to use dark theme.Spike Sprague2014-08-132-2/+2
| * | Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-08-152-10/+10
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-08-112-10/+10
* | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-1672-44/+186
* | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-08-153-41/+41
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-113-41/+41
* | | | | am bbcf8774: Merge "Update option icon transitions" into ub-camera-glacierSpike Sprague2014-08-131-1/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update option icon transitionsSpike Sprague2014-08-131-1/+0
| | |_|/ | |/| |
* | | | am eb944322: Merge "update mode switch transition anims" into ub-camera-glacierSpike Sprague2014-08-131-0/+2
|\| | |
| * | | Merge "update mode switch transition anims" into ub-camera-glacierSpike Sprague2014-08-131-0/+2
| |\ \ \
| | * | | update mode switch transition animsSpike Sprague2014-08-121-0/+2
| | | |/ | | |/|
* | | | am 11186318: Enable 4K video for Shamu.Senpo Hu2014-08-132-0/+4
|\| | | | |_|/ |/| |
| * | Enable 4K video for Shamu.Senpo Hu2014-08-122-0/+4
| |/
| * Import translations. DO NOT MERGEGeoff Mendal2014-08-0455-135/+357
* | Import translations. DO NOT MERGEGeoff Mendal2014-08-0472-573/+387
* | am 08b3c94a: [OC] Adds the new CaptureModule and UI.Sascha Haeberling2014-07-311-0/+49
|\|
| * [OC] Adds the new CaptureModule and UI.Sascha Haeberling2014-07-311-0/+49
* | am ef66e813: Cleaning up unused strings.Sascha Haeberling2014-07-3059-2511/+112
|\|
| * Cleaning up unused strings.Sascha Haeberling2014-07-2959-2511/+112
* | Import translations. DO NOT MERGEBaligh Uddin2014-07-2818-1/+6664
|/
* re-added color and background entries for gcamSpike Sprague2014-07-252-0/+3
* Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacierAlan Newberger2014-07-241-1/+1
|\
| * Ensure default focus mode is continuous-pictureAlan Newberger2014-07-241-1/+1
* | Merge "ripple drawable on shutter button" into ub-camera-glacierSpike Sprague2014-07-2422-13/+223
|\ \ | |/ |/|
| * ripple drawable on shutter buttonSpike Sprague2014-07-2422-13/+223
* | Import translations. DO NOT MERGEBaligh Uddin2014-07-242-4/+4
|/
* Merge "filmstip quantumification" into ub-camera-glacierSpike Sprague2014-07-174-2/+17
|\
| * filmstip quantumificationSpike Sprague2014-07-224-2/+17
* | Import translations. DO NOT MERGEBaligh Uddin2014-07-222-7/+7
|/
* Merge "fixing mode -> color mapping" into ub-camera-glacierSpike Sprague2014-07-212-1/+2
|\
| * fixing mode -> color mappingSpike Sprague2014-07-212-1/+2
* | Merge "clean out timelapse stuff from codebase" into ub-camera-glacierSpike Sprague2014-07-1716-118/+0
|\ \
| * | clean out timelapse stuff from codebaseSpike Sprague2014-07-1716-118/+0
| |/
* / Route switch preferences through SettingManagerAlan Newberger2014-07-181-3/+3
|/