Scott Main
6acd983605
am 3b3e368c: am 60a20061: am 2316d626: docs: add information about using color resources as drawables
...
Merge commit '3b3e368c73f4224b055635e6e79f57cc702d8938'
* commit '3b3e368c73f4224b055635e6e79f57cc702d8938':
docs: add information about using color resources as drawables
2010-07-20 16:54:52 -07:00
Dan Egnor
6db036de9d
am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread
...
Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'
* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
COMMENT-ONLY change to clarify Camera documentation.
2010-07-20 16:54:38 -07:00
Shih-wei Liao
2912d5e023
Merge "Use bccGetExportVars to get mFieldCount, instead of hardwiring "100" in calloc."
2010-07-20 16:44:29 -07:00
Romain Guy
40de41c85d
Merge "Add preliminary support for text rendering."
2010-07-20 16:43:31 -07:00
Jason Sams
83cf94d7b5
Merge "Attempt to fix build '<>' works on mac but does not appear to work on linux yet."
2010-07-20 15:44:55 -07:00
Vasu Nori
fcf3290f00
Merge "make disableWriteAheadLogging method public so apps can disable WAL"
2010-07-20 15:36:31 -07:00
Jason Sams
5bfd57cda2
Merge "Update imageprocessing to remove generated files. Fix thread launch race condition."
2010-07-20 15:10:44 -07:00
Mike Lockwood
469c8b1613
Merge "Add resource configuration flag to indicate whether USB host support exists."
2010-07-20 15:04:01 -07:00
Adam Powell
d6d2250093
Merge "Make sure action bar context modes reserve space for overflow menus on all devices."
2010-07-20 14:28:19 -07:00
Danica Chang
b9388e97e0
Merge "delete ScoSocket"
2010-07-20 14:25:52 -07:00
Nipun Kwatra
11c31d4ba1
Merge "Restart preview after each takePicture is done."
2010-07-20 14:15:59 -07:00
Scott Main
e29d19c006
am 60a20061: am 2316d626: docs: add information about using color resources as drawables
...
Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp
* commit '60a200617791cf4dd3660c514ac6bf17dfcb85de':
docs: add information about using color resources as drawables
2010-07-20 14:01:33 -07:00
Dan Egnor
0dda53db5e
am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread
...
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp
* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
COMMENT-ONLY change to clarify Camera documentation.
2010-07-20 13:58:57 -07:00
Danica Chang
4acba107d4
Merge "deleted android_bluetooth_ScoSocket.cpp from makefile"
2010-07-20 13:55:18 -07:00
Scott Main
5933744aa3
am 2316d626: docs: add information about using color resources as drawables
...
Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread
* commit '2316d6260862230af10d8ca3ff446ad3f560f712':
docs: add information about using color resources as drawables
2010-07-20 13:53:55 -07:00
Eric Laurent
9f73c280be
resolved conflicts for merge of dd206093 to master
...
Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
2010-07-20 13:37:19 -07:00
Dan Egnor
e26a37d259
Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread
2010-07-20 13:23:09 -07:00
Danica Chang
eb1275c1cc
Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp"
2010-07-20 12:47:45 -07:00
Nipun Kwatra
2576dfa9a7
Merge "Use software encoder for time lapse capture."
2010-07-20 12:33:11 -07:00
Adam Powell
d0f579e3c3
Merge "Action bar context mode support for overflow, submenus"
2010-07-20 12:15:08 -07:00
Dan Egnor
a53040a705
resolved conflicts for merge of 9bc4039a to gingerbread
...
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
2010-07-20 11:30:17 -07:00
Eric Laurent
4efee95664
am 22a2d718: Merge "Audio policy manager changes for audio effects" into gingerbread
...
Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp
* commit '22a2d7186d015efcd648dff99500f8467463be82':
Audio policy manager changes for audio effects
2010-07-20 11:28:26 -07:00
Eric Laurent
af1b8029d7
Merge "Audio policy manager changes for audio effects" into gingerbread
2010-07-20 11:25:35 -07:00
Nipun Kwatra
8c9af5a1b2
Merge "Adding support for timelapse capture using still camera's takepicture. Also moving entire implementation into a new class CameraSourceTimeLapse which inherits from CameraSource."
2010-07-20 11:04:49 -07:00
Alex Sakhartchouk
0677b232c3
Merge "Fixing potential buffer overrun errors."
2010-07-20 11:01:34 -07:00
Andreas Huber
8ecc7f04af
am ff45709f: am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.
...
Merge commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe'
* commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe':
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
2010-07-20 10:46:12 -07:00
Andreas Huber
e4aad70d46
am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.
...
Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp
* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
2010-07-20 10:40:39 -07:00
Jean-Baptiste Queru
a267dd05fe
resolved conflicts for merge of ca48433a to master
...
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
2010-07-20 10:40:17 -07:00
The Android Open Source Project
61be2642e4
merge from open-source master
...
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
2010-07-20 10:33:38 -07:00
The Android Open Source Project
e2209d06ba
am fcff6910: merge from open-source master
...
Merge commit 'fcff691057fecdedd6d3033da672d1a473c76066'
* commit 'fcff691057fecdedd6d3033da672d1a473c76066':
typo fixed
2010-07-20 10:28:35 -07:00
The Android Open Source Project
e38fb359a9
merge from open-source master
...
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
2010-07-20 10:25:37 -07:00
Chet Haase
3747c48ab8
Merge "Fix bugs in Sequencer"
2010-07-20 10:07:53 -07:00
Andreas Huber
88607d56ae
am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
...
Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'
* commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
2010-07-20 09:33:09 -07:00
Andreas Huber
4a2f4622f9
am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
...
Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp
* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
2010-07-20 09:24:53 -07:00
Andreas Huber
c49422fba4
Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
2010-07-20 09:18:58 -07:00
Mike Lockwood
0e26b504ec
Merge "MTP host fixes:"
2010-07-20 09:06:41 -07:00
Shih-wei Liao
60d586752d
Merge "Fix Android build"
2010-07-20 01:26:34 -07:00
Shih-wei Liao
ca0ecbc5b7
Merge "Change the include path."
2010-07-20 01:04:58 -07:00
Shih-wei Liao
7a980b626a
Merge "Port ModelViewer to use the new build system. Fix the simulator build on Fountain."
2010-07-20 00:37:42 -07:00
Ying Wang
af8823fce7
Merge "Fix build"
2010-07-19 18:31:45 -07:00
Dan Egnor
351778fa02
Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo
2010-07-19 18:14:50 -07:00
Daniel Lehmann
277ed3b5af
Merge "Replace try-catch code by proper type checking. Saves an exception for each blob."
2010-07-19 18:03:08 -07:00
Jack Palevich
ffa531b0ac
Merge "Fix extraMath state variable."
2010-07-19 18:02:36 -07:00
Jack Palevich
3e9eb868b3
Fix extraMath state variable.
...
Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd
2010-07-19 18:01:39 -07:00
Ying Wang
4947ad6cb9
Merge ".rs files are now built by the build system."
2010-07-19 17:53:01 -07:00
Jack Palevich
297ac296ed
Merge "Try to handle end-of-application better."
2010-07-19 17:52:52 -07:00
Jack Palevich
92a9ae4a02
Try to handle end-of-application better.
...
Handle rotation from portrait to landscape by restarting test if not
finished.
Don't write blank line to csv file.
Change-Id: I154443138817bcec9530123c8388fcf659632336
2010-07-19 17:52:12 -07:00
Jack Palevich
5203706a48
Merge "Write test timings to /sdcard/glperf.csv"
2010-07-19 17:40:46 -07:00
Jack Palevich
63bcb5f8e2
Write test timings to /sdcard/glperf.csv
...
Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
2010-07-19 17:39:52 -07:00
Jack Palevich
ea7b709cab
Merge "Keep screen on for whole test."
2010-07-19 17:02:26 -07:00