summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate ...Spike Sprague2014-09-246-0/+0
|\
| * new sounds for timer ticker and pano / photosphere intermediate capturesSpike Sprague2014-09-236-0/+0
| * Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-09-193-10/+10
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-09-163-10/+10
* | | am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into u...Spike Sprague2014-09-1911-2/+2
|\| |
| * | implement new trash icon, plus some asset cleanupSpike Sprague2014-09-1811-2/+2
| |/
| * Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-09-111-3/+3
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-09-081-3/+3
* | | Import translations. DO NOT MERGEBaligh Uddin2014-09-144-12/+12
* | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-112-5/+5
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-09-082-5/+5
* | | | am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacierSpike Sprague2014-09-0930-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "back to bigger HDR+ icons" into ub-camera-glacierSpike Sprague2014-09-0930-0/+0
| |\ \ \
| | * | | back to bigger HDR+ iconsSpike Sprague2014-09-0930-0/+0
| | | |/ | | |/|
* | | | am 6281a794: Merge "In debug_ui mode, show CAF result state, length of AF sca...Andy Huibers2014-09-081-1/+1
|\| | | | |_|/ |/| |
| * | In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 ...Andy Huibers2014-09-081-1/+1
| |/
* | am eacf9460: Merge "remove stray bool resource for determining if OS is L or ...Spike Sprague2014-09-041-1/+0
|\|
| * remove stray bool resource for determining if OS is L or not,Spike Sprague2014-09-041-1/+0
| * Import translations. DO NOT MERGEBaligh Uddin2014-09-041-1/+1
* | Import translations. DO NOT MERGEBaligh Uddin2014-09-042-5/+5
* | am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-gla...Andy Huibers2014-09-032-16/+16
|\|
| * Merge "Add countdown timer to CaptureModule." into ub-camera-glacierAndy Huibers2014-09-032-16/+16
| |\
| | * Add countdown timer to CaptureModule.Andy Huibers2014-09-022-16/+16
* | | am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacierSpike Sprague2014-09-021-18/+0
|\| |
| * | actionbar opactiy tweaksSpike Sprague2014-09-021-18/+0
| |/
* | am a98b4b10: Merge "boatload of new assets" into ub-camera-glacierSpike Sprague2014-08-27453-15/+189
|\|
| * Merge "boatload of new assets" into ub-camera-glacierSpike Sprague2014-08-27453-15/+189
| |\
| | * boatload of new assetsSpike Sprague2014-08-26453-15/+189
| * | Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-08-2753-113/+61
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-08-2653-113/+61
* | | | am 462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and sho...Andy Huibers2014-08-262-2/+5
|\| | |
| * | | Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, A...Andy Huibers2014-08-262-2/+5
| |\ \ \
| | * | | In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.Andy Huibers2014-08-262-2/+5
| | |/ /
* | | | am 91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camer...Spike Sprague2014-08-261-0/+8
|\| | |
| * | | Material Ripple effect on filmstip buttonsSpike Sprague2014-08-261-0/+8
| |/ /
* | | 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
|\| | | | |/ / |/| |