summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Bump version number for MR1" into gb-ub-photos-carlsbadSascha Haeberling2013-10-211-1/+5
|\
| * Bump version number for MR1Sascha Haeberling2013-10-211-1/+5
* | Merge "Update preview controls on deleting all items." into gb-ub-photos-carl...Erin Dahlgren2013-10-211-1/+5
|\ \ | |/ |/|
| * Update preview controls on deleting all items.Erin Dahlgren2013-10-211-1/+5
* | The initial focus value should be true.ztenghui2013-10-211-1/+1
* | Don't call onCurrentDataChanged for CameraPreview when reloading.ztenghui2013-10-211-3/+14
|/
* Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbadDoris Liu2013-10-193-2/+16
|\
| * Fix SRI orientation on mantaDoris Liu2013-10-183-2/+16
* | Don't crash when preview surface could not be set.Sascha Haeberling2013-10-171-1/+1
* | Update HDR/HDR+ arc menu hover messages.Sascha Haeberling2013-10-171-4/+4
|/
* Merge "Show a preview cover until real preview is ready" into gb-ub-photos-ca...Doris Liu2013-10-179-1/+44
|\
| * Show a preview cover until real preview is readyDoris Liu2013-10-159-3/+44
* | Merge "Don't allow swipe into the film strip view when swipe is disabled" int...ztenghui2013-10-171-1/+8
|\ \
| * | Don't allow swipe into the film strip view when swipe is disabledztenghui2013-10-151-1/+8
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-10-1755-444/+224
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1755-444/+224
* | | | Merge "Send an message to decouple the gcam module change." into gb-ub-photos...ztenghui2013-10-161-1/+6
|\ \ \ \
| * | | | Send an message to decouple the gcam module change.ztenghui2013-10-161-1/+6
| |/ / /
* | | | Merge "update camera launcher icon" into gb-ub-photos-carlsbadAri Sachter-Zeltzer2013-10-165-0/+0
|\ \ \ \
| * | | | update camera launcher iconAri Sachter-Zeltzer2013-10-165-0/+0
| |/ / /
* | | | Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbadDoris Liu2013-10-163-23/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Fix shutter covering pie menuDoris Liu2013-10-163-23/+28
| | |/ | |/|
* | | Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-p...Igor Murashkin2013-10-151-0/+1
|\ \ \
| * | | gcam: Fix AF spinner not to reset when changing positionIgor Murashkin2013-10-151-0/+1
* | | | Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-phot...Doris Liu2013-10-151-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Dismiss switcher popup when shutter button is clickedDoris Liu2013-10-151-0/+3
* | | | Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbadIgor Murashkin2013-10-1585-14101/+15692
|\ \ \ \ | | |/ / | |/| |
| * | | CameraUtil: add float clamp functionIgor Murashkin2013-10-141-1/+7
| * | | am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-pho...Angus Kong2013-10-131-0/+3
| |\ \ \
| * \ \ \ am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-u...Angus Kong2013-10-133-10/+22
| |\ \ \ \
| * \ \ \ \ am 28019abc: Change keyguard camera layout to show no menu options in indicatorAlan Newberger2013-10-131-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take an...Sascha Haeberling2013-10-1325-0/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-car...Doris Liu2013-10-133-26/+25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 2d5c7478: Don\'t load data when it\'s secure camera.Angus Kong2013-10-131-1/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am f1582c9c: Adjust the position after layout change.Angus Kong2013-10-121-20/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-1255-0/+495
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1255-0/+495
| * | | | | | | | | | | am a5002410: Merge "Correct initial orientation of camera controls" into gb-u...Doris Liu2013-10-123-44/+61
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 27562534: Merge "Finish the secure camera activity when user try to play a...ztenghui2013-10-111-5/+13
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-...Doris Liu2013-10-112-12/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 3772d2f4: restore Usage StatisticsSeth Raphael2013-10-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am c13cc22b: Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f0622191: Merge "gcam: Allow debugging postcapture image to be added to me...Ruben Brunk2013-10-111-4/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix build break.Sameer Padala2013-10-1149-4609/+3
| * | | | | | | | | | | | | | | | Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-devBaligh Uddin2013-10-1155-179/+179
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Revert "Revert "Import translations. DO NOT MERGE""Baligh Uddin2013-10-1155-179/+179
| * | | | | | | | | | | | | | | | | am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-...Angus Kong2013-10-111-4/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert "Import translations. DO NOT MERGE"" into klp-devBaligh Uddin2013-10-1155-179/+179
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2013-10-1155-179/+179
| * | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-1155-179/+179
| |\| | | | | | | | | | | | | | | | |