summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in lmp-release history after reset to lmp-devThe Android Automerger2014-08-260-0/+0
|\
| * merge in lmp-release history after reset to b1e38771fce22955c08905ce579a0d7c9...The Android Automerger2014-08-260-0/+0
| |\
| | * merge in lmp-release history after reset to ceff90aa9bcb2cfce2f48b187948af8bb...The Android Automerger2014-08-250-0/+0
| | |\
| | | * merge in lmp-release history after reset to ceff90aa9bcb2cfce2f48b187948af8bb...The Android Automerger2014-08-240-0/+0
| | |/|
| | | * merge in lmp-release history after reset to ceff90aa9bcb2cfce2f48b187948af8bb...The Android Automerger2014-08-230-0/+0
| | |/|
| | | * merge in lmp-release history after reset to fda968ec2ff1ce9caf79ee3f6c2e5b165...The Android Automerger2014-08-210-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to 5f346aea6711dd7b34b649f2294c6caf2...The Android Automerger2014-08-200-0/+0
| | | | |\
| | | | | * merge in lmp-release history after reset to acb9e27bb2bd53225ca3a9bf92729787b...The Android Automerger2014-08-190-0/+0
| | | | | |\
| | | | | | * merge in lmp-release history after reset to 0938937f02462896b9640274ea8428e0c...The Android Automerger2014-08-180-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-release history after reset to 5d25fcf1925561605defad987af3ecc27...The Android Automerger2014-08-170-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-release history after reset to 843f226d937f35bbfcd30ccc195631c0e...The Android Automerger2014-08-140-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-release history after reset to c490dd5c7b6caae2af1ef7a2006f9d3ea...The Android Automerger2014-08-130-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-release history after reset to 22b281725d5cbc75165fb1a8cbda7153d...The Android Automerger2014-08-120-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-release history after reset to fd7821064bdbd3bda515d03f19b7ca6a1...The Android Automerger2014-08-110-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-release history after reset to fd7821064bdbd3bda515d03f19b7ca6a1...The Android Automerger2014-08-100-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-release history after reset to fd7821064bdbd3bda515d03f19b7ca6a1...The Android Automerger2014-08-090-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * rollback of b/16632474 and ag/518674Spike Sprague2014-08-082-2/+1
| | | | | | | | | | | | * Route zoom value through to zoomIndex in device APIAlan Newberger2014-08-081-2/+2
* | | | | | | | | | | | | am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autof...Andy Huibers2014-08-264-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Show animated AF ring UI when lens is moving in continuous autofocus.Andy Huibers2014-08-254-8/+7
* | | | | | | | | | | | | | am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-gla...Andy Huibers2014-08-268-20/+32
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Enable Face rectangles for debugging." into ub-camera-glacierAndy Huibers2014-08-268-20/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Enable Face rectangles for debugging.Andy Huibers2014-08-258-20/+32
* | | | | | | | | | | | | | | am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." ...Sascha Haeberling2014-08-251-4/+8
|\| | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera...Sascha Haeberling2014-08-251-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix crash on Shamu since it's no longer camera 2 FULL.Sascha Haeberling2014-08-251-4/+8
* | | | | | | | | | | | | | am 4cc78bb3: set actionbar background to complete transparentSpike Sprague2014-08-251-0/+4
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | set actionbar background to complete transparentSpike Sprague2014-08-251-0/+4
| |/ / / / / / / / / / / /
* | / / / / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2014-08-2470-183/+115
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." ...Sascha Haeberling2014-08-2311-109/+244
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camer...Sascha Haeberling2014-08-2311-109/+244
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Enable switching within CaptureModule to HDR+ and back.Sascha Haeberling2014-08-2211-109/+244
* | | | | | | | | | | | | am 799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based sc...Sol Boucher2014-08-238-113/+76
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-...Sol Boucher2014-08-238-113/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Switch from stepwise index-based zoom to a ratio-based scaleSol Boucher2014-08-228-113/+76
* | | | | | | | | | | | | am 6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-came...Baligh Uddin2014-08-220-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | | am 0dec43e3: filmstrip actionbar tweaksSpike Sprague2014-08-221-9/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | filmstrip actionbar tweaksSpike Sprague2014-08-221-9/+0
* | | | | | | | | | | | | | 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 fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacierSpike Sprague2014-08-225-50/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "filmstrip actionbar tweaks" into ub-camera-glacierSpike Sprague2014-08-225-50/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | filmstrip actionbar tweaksSpike Sprague2014-08-225-59/+88
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am f859793d: Merge "Pick the preview size based on the selected picture size....Sascha Haeberling2014-08-223-56/+46
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Pick the preview size based on the selected picture size." into ub-cam...Sascha Haeberling2014-08-223-56/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Pick the preview size based on the selected picture size.Sascha Haeberling2014-08-213-56/+46
| | |/ / / / / / / / / / / /
* | | | | / / / / / / / / / am ba97d192: animate filmstrip bottom button bar in and out from the bottom o...Spike Sprague2014-08-214-10/+41
|\| | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | animate filmstrip bottom button bar in and outSpike Sprague2014-08-214-10/+41
| |/ / / / / / / / / / /