summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 2c8ac0ad to ub-camera-glacierDoris Liu2014-06-122-34/+0
|\
| * Remove workaround for K-MR1 that registers redundant preview callbacksDoris Liu2014-06-132-34/+0
* | Merge "Refactor out Camera.Parameters." into ub-camera-glacierAngus Kong2014-06-1221-306/+1068
|\ \
| * | Refactor out Camera.Parameters.Angus Kong2014-06-1221-306/+1068
* | | Merge "disambiguate media types in capture/filmstrip a11y descriptions" into ...Spike Sprague2014-06-107-16/+55
|\ \ \
| * | | disambiguate media types in capture/filmstrip a11y descriptionsSpike Sprague2014-06-117-16/+55
* | | | am 40468e76: Merge "intent captrue review gets its own ImageView! instead of ...Spike Sprague2014-06-114-4/+57
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | intent captrue review gets its own ImageView!Spike Sprague2014-06-094-4/+57
| |/
* / Refactor CameraManager hierarchy to support new implementationsSol Boucher2014-06-096-479/+602
|/
* Merge "Timeout on wait lock and throw exception to prevent ANR." into ub-came...Erin Dahlgren2014-06-021-7/+7
|\
| * Timeout on wait lock and throw exception to prevent ANR.Erin Dahlgren2014-05-231-7/+7
* | secure camera -> gallery launch hardcoded toSpike Sprague2014-05-302-23/+27
* | am cbf2efe0: Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-evergladesSeth Raphael2014-05-271-5/+9
|\ \
| * \ Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-evergladesSeth Raphael2014-05-271-5/+9
| |\ \
| | * | Fix NPE in CountdownSoundPlayer.Seth Raphael2014-05-271-5/+9
* | | | am 7dc0fade: Merge "Restore the flash setting after HDR is off." into ub-came...Angus Kong2014-05-231-1/+16
|\| | | | |_|/ |/| |
| * | Merge "Restore the flash setting after HDR is off." into ub-camera-evergladesAngus Kong2014-05-231-1/+16
| |\ \
| | * | Restore the flash setting after HDR is off.Angus Kong2014-05-231-1/+16
* | | | am 8f93077d: Merge "Include signature in cache keys for Glide." into ub-camer...Sam Judd2014-05-233-13/+78
|\| | |
| * | | Include signature in cache keys for Glide.Sam Judd2014-05-233-13/+78
* | | | resolved conflicts for merge of 26aa92bf to ub-camera-fishlakeDoris Liu2014-05-235-8/+165
|\| | |
| * | | Add cling for settings buttonDoris Liu2014-05-235-8/+165
| |/ /
* | | am 293b9628: Merge "Disable flash when HDR mode is on." into ub-camera-evergl...Angus Kong2014-05-221-1/+12
|\| |
| * | Merge "Disable flash when HDR mode is on." into ub-camera-evergladesAngus Kong2014-05-221-1/+12
| |\ \ | | |/ | |/|
| | * Disable flash when HDR mode is on.Angus Kong2014-05-221-1/+12
* | | am b0800488: Merge "Address some code style nits." into ub-camera-evergladesSeth Raphael2014-05-221-2/+2
|\| |
| * | Address some code style nits.Seth Raphael2014-05-221-2/+2
* | | am 75b16d7d: Merge "Convert camera size settings on upgrade" into ub-camera-e...Seth Raphael2014-05-223-49/+95
|\| |
| * | Convert camera size settings on upgradeSeth Raphael2014-05-223-49/+95
| |/
* | am 73b109e7: Merge "Fix jank when switching in and out of hdr+ Also, fix alig...Seth Raphael2014-05-223-6/+40
|\|
| * Fix jank when switching in and out of hdr+Seth Raphael2014-05-223-6/+40
* | Change naming to indicate that date taken is in milliseconds.Andy Huibers2014-05-222-16/+16
* | am 404126e3: Merge "Cache queries to Camera.Parameters.getSupportedPictureSiz...Andy Huibers2014-05-214-8/+144
|\|
| * Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed...Andy Huibers2014-05-214-8/+144
| |\
| | * Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed upAndy Huibers2014-05-214-8/+144
* | | am 6809eb84: Freeze the screen during camera switch to hide visual distractionDoris Liu2014-05-215-0/+91
|\| |
| * | Freeze the screen during camera switch to hide visual distractionDoris Liu2014-05-215-0/+91
* | | am 42c07cc1: Merge "added Filmstrip viewtype tags for session, secure album p...Spike Sprague2014-05-214-4/+6
|\| |
| * | Merge "added Filmstrip viewtype tags for session, secure album placeholder, a...Spike Sprague2014-05-214-4/+6
| |\ \
| | * | added Filmstrip viewtype tags for session, secure album placeholder, and came...Spike Sprague2014-05-214-4/+6
* | | | am 489293d4: Merge "Add timer duration to UsageStatistics." into ub-camera-ev...Andy Huibers2014-05-212-2/+5
|\| | |
| * | | Merge "Add timer duration to UsageStatistics." into ub-camera-evergladesAndy Huibers2014-05-212-2/+5
| |\ \ \
| | * | | Add timer duration to UsageStatistics.Andy Huibers2014-05-202-2/+5
* | | | | am ff988f23: Merge "Reset the decoder in ZoomView when data updated." into ub...Angus Kong2014-05-212-14/+32
|\| | | |
| * | | | Merge "Reset the decoder in ZoomView when data updated." into ub-camera-everg...Angus Kong2014-05-212-14/+32
| |\ \ \ \
| | * | | | Reset the decoder in ZoomView when data updated.Angus Kong2014-05-212-14/+32
* | | | | | am cfe9acc2: Ignore metadata update callback after paused.Angus Kong2014-05-211-0/+7
|\| | | | |
| * | | | | Ignore metadata update callback after paused.Angus Kong2014-05-211-0/+7
| | |_|/ / | |/| | |
* | | | | Merge commit '3cfd962f' into manualmergeSeth Raphael2014-05-214-11/+61
|\| | | |
| * | | | Merge "Add Letterboxing for HDR+" into ub-camera-evergladesSeth Raphael2014-05-214-10/+60
| |\ \ \ \ | | |_|/ / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 16:16:58 +0000