summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of d8e8186c to masterKenny Root2010-09-281-1/+2
|\
| * am 05105f7a: Update OBB API to include callbacksKenny Root2010-09-281-1/+2
| |\
| | * Update OBB API to include callbacksKenny Root2010-09-281-1/+2
* | | am d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlaye...Andreas Huber2010-09-281-1/+5
|\ \ \ | |/ /
| * | am be045061: Merge "Instead of constantly polling the AudioPlayer to see if i...Andreas Huber2010-09-281-1/+5
| |\ \ | | |/
| | * Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS...Andreas Huber2010-09-281-1/+5
| | |\
| | | * Instead of constantly polling the AudioPlayer to see if it reached EOS or fin...Andreas Huber2010-09-281-1/+5
* | | | am c889bbfa: am 4769f579: Merge "Vorbis files may have more samples encoded t...Andreas Huber2010-09-281-0/+2
|\ \ \ \ | |/ / /
| * | | am 4769f579: Merge "Vorbis files may have more samples encoded that should be...Andreas Huber2010-09-281-0/+2
| |\ \ \ | | |/ /
| | * | Merge "Vorbis files may have more samples encoded that should be used, i.e. w...Andreas Huber2010-09-281-0/+2
| | |\ \ | | | |/
| | | * Vorbis files may have more samples encoded that should be used, i.e. we have ...Andreas Huber2010-09-281-0/+2
* | | | am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into ging...Andreas Huber2010-09-281-0/+72
|\ \ \ \ | |/ / /
| * | | am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-281-0/+72
| |\ \ \ | | |/ /
| | * | Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-281-0/+72
| | |\ \ | | | |/ | | |/|
| | | * Squashed commit of the following:Andreas Huber2010-09-271-0/+72
* | | | Add support for transferring touch focus.Jeff Brown2010-09-271-0/+11
* | | | am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events acros...Jeff Brown2010-09-274-50/+87
|\ \ \ \ | |/ / /
| * | | am 14a288da: Merge "Add suuport for splitting touch events across windows." i...Jeff Brown2010-09-274-50/+87
| |\ \ \ | | |/ /
| | * | Merge "Add suuport for splitting touch events across windows." into gingerbreadJeff Brown2010-09-274-50/+87
| | |\ \ | | | |/ | | |/|
| | | * Add suuport for splitting touch events across windows.Jeff Brown2010-09-264-50/+87
* | | | Fix the CameraHardwareInterface::setPreviewWindow comment.Jamie Gennis2010-09-251-1/+1
* | | | am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbreadMathias Agopian2010-09-241-1/+9
|\ \ \ \ | |/ / /
| * | | am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbreadMathias Agopian2010-09-241-1/+9
| |\ \ \ | | |/ /
| | * | Merge changes I1f7c4535,I741c68a2 into gingerbreadMathias Agopian2010-09-241-1/+9
| | |\ \
| | | * | add support for [1974164] Be able to take a screen shot on the deviceMathias Agopian2010-09-241-1/+9
| | | |/
* | | | am 3e07c000: am 74865ef6: Merge "Add locking around ZIP seeking" into gingerb...Kenny Root2010-09-241-2/+6
|\ \ \ \ | |/ / /
| * | | am 74865ef6: Merge "Add locking around ZIP seeking" into gingerbreadKenny Root2010-09-241-2/+6
| |\ \ \ | | |/ /
| | * | Add locking around ZIP seekingKenny Root2010-09-241-2/+6
| | |/
* | | am 4ec134cd: am cce0cd13: Merge "Looper: use pthread_once for TLS key initial...Jeff Brown2010-09-211-0/+1
|\ \ \ | |/ /
| * | am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." int...Jeff Brown2010-09-211-0/+1
| |\ \ | | |/
| | * Merge "Looper: use pthread_once for TLS key initialization." into gingerbreadJeff Brown2010-09-211-0/+1
| | |\
| | | * Looper: use pthread_once for TLS key initialization.Jeff Brown2010-09-211-0/+1
* | | | am af909581: am 67738486: Merge "Remove stagefright foundation\'s incompatibl...Andreas Huber2010-09-211-37/+12
|\ \ \ \ | |/ / /
| * | | am 67738486: Merge "Remove stagefright foundation\'s incompatible logging int...Andreas Huber2010-09-211-37/+12
| |\ \ \ | | |/ /
| | * | Remove stagefright foundation's incompatible logging interface and update cal...Andreas Huber2010-09-211-37/+12
| | |/
* | | am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUO...Wu-cheng Li2010-09-211-6/+8
|\ \ \ | |/ /
| * | am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.Wu-cheng Li2010-09-211-6/+8
| |\ \ | | |/
| | * Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.Wu-cheng Li2010-09-211-6/+8
* | | am bc9599d4: am 838e93ed: Merge "Looper: Drop default parameters in favor of ...Jeff Brown2010-09-171-6/+9
|\ \ \ | |/ /
| * | am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overl...Jeff Brown2010-09-171-6/+9
| |\ \ | | |/
| | * Looper: Drop default parameters in favor of a safer overload.Jeff Brown2010-09-161-6/+9
* | | Merge "Adding default profiles for specific levels."Nipun Kwatra2010-09-171-4/+19
|\ \ \
| * | | Adding default profiles for specific levels.Nipun Kwatra2010-09-171-4/+19
* | | | Implemented frequent read returns for quick stop in time lapse.Nipun Kwatra2010-09-171-1/+60
* | | | am 6f0ff46c: am 9c258710: Merge "Fix app switch latency optimization." into g...Jeff Brown2010-09-161-6/+6
|\ \ \ \ | | |/ / | |/| |
| * | | am 9c258710: Merge "Fix app switch latency optimization." into gingerbreadJeff Brown2010-09-161-6/+6
| |\ \ \ | | | |/ | | |/|
| | * | Fix app switch latency optimization.Jeff Brown2010-09-161-6/+6
* | | | Add YUV420P color format support for video output from camera halJames Dong2010-09-161-1/+4
* | | | am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbreadJeff Brown2010-09-161-2/+2
|\ \ \ \ | |/ / /
| * | | am 24326f72: Merge "Input API review." into gingerbreadJeff Brown2010-09-161-2/+2
| |\ \ \ | | |/ /