Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Bump version number for MR1" into gb-ub-photos-carlsbad | Sascha Haeberling | 2013-10-21 | 1 | -1/+5 |
|\ | |||||
| * | Bump version number for MR1 | Sascha Haeberling | 2013-10-21 | 1 | -1/+5 |
* | | Merge "Update preview controls on deleting all items." into gb-ub-photos-carl... | Erin Dahlgren | 2013-10-21 | 1 | -1/+5 |
|\ \ | |/ |/| | |||||
| * | Update preview controls on deleting all items. | Erin Dahlgren | 2013-10-21 | 1 | -1/+5 |
* | | The initial focus value should be true. | ztenghui | 2013-10-21 | 1 | -1/+1 |
* | | Don't call onCurrentDataChanged for CameraPreview when reloading. | ztenghui | 2013-10-21 | 1 | -3/+14 |
|/ | |||||
* | Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad | Doris Liu | 2013-10-19 | 3 | -2/+16 |
|\ | |||||
| * | Fix SRI orientation on manta | Doris Liu | 2013-10-18 | 3 | -2/+16 |
* | | Don't crash when preview surface could not be set. | Sascha Haeberling | 2013-10-17 | 1 | -1/+1 |
* | | Update HDR/HDR+ arc menu hover messages. | Sascha Haeberling | 2013-10-17 | 1 | -4/+4 |
|/ | |||||
* | Merge "Show a preview cover until real preview is ready" into gb-ub-photos-ca... | Doris Liu | 2013-10-17 | 9 | -1/+44 |
|\ | |||||
| * | Show a preview cover until real preview is ready | Doris Liu | 2013-10-15 | 9 | -3/+44 |
* | | Merge "Don't allow swipe into the film strip view when swipe is disabled" int... | ztenghui | 2013-10-17 | 1 | -1/+8 |
|\ \ | |||||
| * | | Don't allow swipe into the film strip view when swipe is disabled | ztenghui | 2013-10-15 | 1 | -1/+8 |
* | | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad | Baligh Uddin | 2013-10-17 | 55 | -444/+224 |
|\ \ \ | |||||
| * | | | Import translations. DO NOT MERGE | Baligh Uddin | 2013-10-17 | 55 | -444/+224 |
* | | | | Merge "Send an message to decouple the gcam module change." into gb-ub-photos... | ztenghui | 2013-10-16 | 1 | -1/+6 |
|\ \ \ \ | |||||
| * | | | | Send an message to decouple the gcam module change. | ztenghui | 2013-10-16 | 1 | -1/+6 |
| |/ / / | |||||
* | | | | Merge "update camera launcher icon" into gb-ub-photos-carlsbad | Ari Sachter-Zeltzer | 2013-10-16 | 5 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | update camera launcher icon | Ari Sachter-Zeltzer | 2013-10-16 | 5 | -0/+0 |
| |/ / / | |||||
* | | | | Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad | Doris Liu | 2013-10-16 | 3 | -23/+28 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix shutter covering pie menu | Doris Liu | 2013-10-16 | 3 | -23/+28 |
| | |/ | |/| | |||||
* | | | Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-p... | Igor Murashkin | 2013-10-15 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | gcam: Fix AF spinner not to reset when changing position | Igor Murashkin | 2013-10-15 | 1 | -0/+1 |
* | | | | Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-phot... | Doris Liu | 2013-10-15 | 1 | -0/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Dismiss switcher popup when shutter button is clicked | Doris Liu | 2013-10-15 | 1 | -0/+3 |
* | | | | Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad | Igor Murashkin | 2013-10-15 | 85 | -14101/+15692 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | CameraUtil: add float clamp function | Igor Murashkin | 2013-10-14 | 1 | -1/+7 |
| * | | | am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-pho... | Angus Kong | 2013-10-13 | 1 | -0/+3 |
| |\ \ \ | |||||
| * \ \ \ | am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-u... | Angus Kong | 2013-10-13 | 3 | -10/+22 |
| |\ \ \ \ | |||||
| * \ \ \ \ | am 28019abc: Change keyguard camera layout to show no menu options in indicator | Alan Newberger | 2013-10-13 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take an... | Sascha Haeberling | 2013-10-13 | 25 | -0/+21 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-car... | Doris Liu | 2013-10-13 | 3 | -26/+25 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am 2d5c7478: Don\'t load data when it\'s secure camera. | Angus Kong | 2013-10-13 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am f1582c9c: Adjust the position after layout change. | Angus Kong | 2013-10-12 | 1 | -20/+20 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge "Import translations. DO NOT MERGE" into klp-dev | Baligh Uddin | 2013-10-12 | 55 | -0/+495 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2013-10-12 | 55 | -0/+495 |
| * | | | | | | | | | | | am a5002410: Merge "Correct initial orientation of camera controls" into gb-u... | Doris Liu | 2013-10-12 | 3 | -44/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | am 27562534: Merge "Finish the secure camera activity when user try to play a... | ztenghui | 2013-10-11 | 1 | -5/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-... | Doris Liu | 2013-10-11 | 2 | -12/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am 3772d2f4: restore Usage Statistics | Seth Raphael | 2013-10-11 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am c13cc22b: Add strings to better describe HDR mode menus | Alan Newberger | 2013-10-11 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f0622191: Merge "gcam: Allow debugging postcapture image to be added to me... | Ruben Brunk | 2013-10-11 | 1 | -4/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Fix build break. | Sameer Padala | 2013-10-11 | 49 | -4609/+3 |
| * | | | | | | | | | | | | | | | | Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev | Baligh Uddin | 2013-10-11 | 55 | -179/+179 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Revert "Revert "Import translations. DO NOT MERGE"" | Baligh Uddin | 2013-10-11 | 55 | -179/+179 |
| * | | | | | | | | | | | | | | | | | am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-... | Angus Kong | 2013-10-11 | 1 | -4/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev | Baligh Uddin | 2013-10-11 | 55 | -179/+179 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" | Baligh Uddin | 2013-10-11 | 55 | -179/+179 |
| * | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-dev | Baligh Uddin | 2013-10-11 | 55 | -179/+179 |
| |\| | | | | | | | | | | | | | | | | |