Commit Graph

8192 Commits

Author SHA1 Message Date
Vladimir Chtchetkine
d7555c0933 am c9a94b0f: Merge "Implement CAMERA_MSG_PREVIEW_FRAME callback"
* commit 'c9a94b0f50ab781b174f620484d6d07e10d30e3e':
  Implement CAMERA_MSG_PREVIEW_FRAME callback
2011-10-18 07:19:57 -07:00
Vladimir Chtchetkine
c9a94b0f50 Merge "Implement CAMERA_MSG_PREVIEW_FRAME callback" 2011-10-18 07:17:43 -07:00
David Turner
213d0bc176 am 207118ad: Merge "Replace match_parent with fill_parent; Declare importGLInit() and importGLDeinit() regardless DISABLE_IMPORTGL (otherwise compiling in c++ may fail)"
* commit '207118ad6d68338af0fbf75df29e15cbf5c794d5':
  Replace match_parent with fill_parent; Declare importGLInit() and importGLDeinit() regardless DISABLE_IMPORTGL (otherwise compiling in c++ may fail)
2011-10-18 01:49:47 -07:00
David Turner
207118ad6d Merge "Replace match_parent with fill_parent; Declare importGLInit() and importGLDeinit() regardless DISABLE_IMPORTGL (otherwise compiling in c++ may fail)" 2011-10-18 01:46:40 -07:00
Vladimir Chtchetkine
caa1aeafba Implement CAMERA_MSG_PREVIEW_FRAME callback
Also does better work detecting pixel format for video frames, depending on the
mode that camera is intended to be operated with.

Change-Id: I352204b8d6d1a9e7857d77b6363de2bb5d5db0dd
2011-10-17 12:56:54 -07:00
Scott Main
009c383a37 am ac6db56a: am e842e956: update andriod beam demo. add action item to go to Android Beam settings, add help info, and add callback for on-push-complete
* commit 'ac6db56abde6ec08a5b869dad7400eaa5344dfd1':
  update andriod beam demo. add action item to go to Android Beam settings, add help info, and add callback for on-push-complete
2011-10-17 11:40:38 -07:00
Scott Main
ac6db56abd am e842e956: update andriod beam demo. add action item to go to Android Beam settings, add help info, and add callback for on-push-complete
* commit 'e842e956c203b322bd39c05ed5660c917b9ae443':
  update andriod beam demo. add action item to go to Android Beam settings, add help info, and add callback for on-push-complete
2011-10-17 11:32:43 -07:00
Scott Main
e842e956c2 update andriod beam demo.
add action item to go to Android Beam settings,
add help info, and add callback for on-push-complete

Change-Id: I2e0e8b9d6e66c507d62012e809ee0c01e1298f20
2011-10-17 10:37:07 -07:00
Eddy Talvala
1e88e5c430 am 009d3b25: Merge "Added exposure compensation control for the fake camera."
* commit '009d3b25faeef5937bc9dccd8fa865109bb9ca51':
  Added exposure compensation control for the fake camera.
2011-10-17 09:53:25 -07:00
Eddy Talvala
009d3b25fa Merge "Added exposure compensation control for the fake camera." 2011-10-17 09:52:27 -07:00
Steve Block
d8f7bf5932 am 3e9dae13: Merge "Fix use of WebView.loadData() to avoid passing invalid encoding"
* commit '3e9dae13d6ba64855c7466700e51b5de214e27d0':
  Fix use of WebView.loadData() to avoid passing invalid encoding
2011-10-17 09:03:02 -07:00
Steve Block
3e9dae13d6 Merge "Fix use of WebView.loadData() to avoid passing invalid encoding" 2011-10-17 09:00:28 -07:00
Scott Main
a70ea82c9d am 094aad35: am 2f33e1ea: fix android beam demo icons
* commit '094aad3503431655939e80a0329a3769fdeabb2f':
  fix android beam demo icons
2011-10-17 07:10:44 -07:00
Scott Main
56167a2231 am 8534a980: am 1bd9bf80: fix beam demo build target
* commit '8534a9806cb7f89cf450d12501fa4a468e031147':
  fix beam demo build target
2011-10-17 07:10:43 -07:00
Scott Main
653d2c5d9f am 3ea1b12e: am f21a3e28: Merge "fix android beam icon and add make file" into ics-mr0
* commit '3ea1b12e88180f6abce706c6a2534b8c7bbe7b0e':
  fix android beam icon and add make file
2011-10-17 07:10:38 -07:00
Steve Block
aa29f342e5 Fix use of WebView.loadData() to avoid passing invalid encoding
No change in behavior, as invalid encodings have always been ignored.

Bug: 5125738
Change-Id: Ice8ccc2b82e3c5d28169788321dfbbfadb29b392
2011-10-17 15:09:35 +01:00
Scott Main
094aad3503 am 2f33e1ea: fix android beam demo icons
* commit '2f33e1eae0671cc1aa3d367f8d900b532f6ca80f':
  fix android beam demo icons
2011-10-17 07:07:07 -07:00
Scott Main
8534a9806c am 1bd9bf80: fix beam demo build target
* commit '1bd9bf806578cbb79763dc65067e45aa4e081f70':
  fix beam demo build target
2011-10-17 07:07:06 -07:00
Scott Main
3ea1b12e88 am f21a3e28: Merge "fix android beam icon and add make file" into ics-mr0
* commit 'f21a3e284705343eba1eeade90aa1086ce38e2c6':
  fix android beam icon and add make file
2011-10-17 07:06:55 -07:00
Christine Chen
366396d9b0 Added exposure compensation control for the fake camera.
Change-Id: I10bc16d9d521f82e12ff335eed29465ac08b5595
2011-10-14 15:14:36 -07:00
Scott Main
2f33e1eae0 fix android beam demo icons
Change-Id: I569f92eafc0a53622443457a73fabbdce83ef73c
2011-10-14 14:30:12 -07:00
Scott Main
1bd9bf8065 fix beam demo build target
Change-Id: I2f9a2b24802ee0461257b4e1ee65a5f2b6298ade
2011-10-14 14:09:56 -07:00
Scott Main
f21a3e2847 Merge "fix android beam icon and add make file" into ics-mr0 2011-10-14 14:04:02 -07:00
Scott Main
936304c95f fix android beam icon and add make file
Change-Id: Ib7a77ec6a5c15c06c009bb3a47c1f983f98c553a
2011-10-14 14:02:45 -07:00
Scott Main
190db4571e am 54303011: (-s ours) am 6a6335f4: (-s ours) DO NOT MERGE. remove stream item activities from sample app
* commit '543030116428313af22966789e3c4d3a913de30f':
  DO NOT MERGE. remove stream item activities from sample app
2011-10-14 12:32:24 -07:00
Scott Main
5430301164 am 6a6335f4: (-s ours) DO NOT MERGE. remove stream item activities from sample app
* commit '6a6335f4fd3b5be7ea55c04b6dfeb889b62b80be':
  DO NOT MERGE. remove stream item activities from sample app
2011-10-14 12:29:46 -07:00
Scott Main
6a6335f4fd DO NOT MERGE. remove stream item activities from sample app
Change-Id: I485e68e011a12ec91f0e5f3eae742217acad8ca3
2011-10-14 11:33:38 -07:00
Scott Main
359dfb5dcd am a09ca746: am 8e567707: docs: add update information to some samples
* commit 'a09ca74682528327e43c6f47953d8560eb40cd0c':
  docs: add update information to some samples
2011-10-14 11:23:44 -07:00
Scott Main
a09ca74682 am 8e567707: docs: add update information to some samples
* commit '8e56770703951a9ee8255def50209f4dc0322584':
  docs: add update information to some samples
2011-10-14 11:12:42 -07:00
Scott Main
8e56770703 docs: add update information to some samples
Change-Id: Ifafa507bd9e74f2605fe190b12f831051af5f422
2011-10-14 11:09:54 -07:00
Scott Main
6b559011a6 am 1317e5ee: am 0f53a4d2: rename Android Beam sample to Andriod Beam Demo and add launcher icon
* commit '1317e5ee105fdd01f575462f34b37abd7d2ef0ce':
  rename Android Beam sample to Andriod Beam Demo and add launcher icon
2011-10-14 10:33:20 -07:00
Scott Main
1317e5ee10 am 0f53a4d2: rename Android Beam sample to Andriod Beam Demo and add launcher icon
* commit '0f53a4d2942a463bc3edf25210c523dc6c902373':
  rename Android Beam sample to Andriod Beam Demo and add launcher icon
2011-10-14 10:31:23 -07:00
Scott Main
0f53a4d294 rename Android Beam sample to Andriod Beam Demo and add launcher icon
Change-Id: If6edb7ac9ba2743ce0dbc39be6f1eede8ef66aaa
2011-10-14 10:28:25 -07:00
Scott Main
45ba929ade am e4dab43d: am 34ff3e78: docs: add update notice to HC gallery sample and add screenshots
* commit 'e4dab43df7aa4b1ecd3e92cfe83692c40ebaf56d':
  docs: add update notice to HC gallery sample and add screenshots
2011-10-14 05:07:05 -07:00
Scott Main
e4dab43df7 am 34ff3e78: docs: add update notice to HC gallery sample and add screenshots
* commit '34ff3e789cd0e2cb10ddff57055cb0d2be3ec83d':
  docs: add update notice to HC gallery sample and add screenshots
2011-10-14 05:02:02 -07:00
Scott Main
34ff3e789c docs: add update notice to HC gallery sample and add screenshots
Change-Id: Ibb8d269a68cca273867049655c95260651e23586
2011-10-14 04:20:16 -07:00
David 'Digit' Turner
9e6660bd9a am 8ece910f: ndk: Update OpenSLES platform files for API level 14
* commit '8ece910f60e55f44bceec5588a767feef12f639e':
  ndk: Update OpenSLES platform files for API level 14
2011-10-13 17:42:08 -07:00
David 'Digit' Turner
8ece910f60 ndk: Update OpenSLES platform files for API level 14
Change-Id: I029b7eea0db05613389e8cd22b0440a56c850d53
2011-10-14 02:29:28 +02:00
David 'Digit' Turner
8c09dff58c am 3a195fe3: Merge "ndk: Add OpenMAX headers and symbols for API level 14"
* commit '3a195fe3c5ada3170d11f8aa7e4e38951867693b':
  ndk: Add OpenMAX headers and symbols for API level 14
2011-10-13 16:56:20 -07:00
David 'Digit' Turner
3a195fe3c5 Merge "ndk: Add OpenMAX headers and symbols for API level 14" 2011-10-13 16:54:06 -07:00
David 'Digit' Turner
2c4b4c1a3d ndk: Add OpenMAX headers and symbols for API level 14
Change-Id: I61f6f255357781d1912e25bd43815fd34ff83d0e
2011-10-14 01:52:11 +02:00
Jeff Sharkey
49c89cd96a am 74767750: Add DownloadProvider tests.
* commit '74767750b6eb69c1b226e7d6abec3128d8f044ee':
  Add DownloadProvider tests.
2011-10-13 16:45:48 -07:00
David 'Digit' Turner
7df0709acc am 7761beeb: ndk: <time.h> Add missing clock_settime()/clock_nanosleep() declarations
* commit '7761beeb56c857150052b0576e639375f4b1a55c':
  ndk: <time.h> Add missing clock_settime()/clock_nanosleep() declarations
2011-10-13 16:45:48 -07:00
David 'Digit' Turner
6333c3be1f am b298c3bd: Merge "ndk: remove obsolete libthread_db.a binaries"
* commit 'b298c3bdc99ecc7775f65d1453c13afce83ba9cd':
  ndk: remove obsolete libthread_db.a binaries
2011-10-13 16:45:48 -07:00
David 'Digit' Turner
2032fce8da am 7acb3cd1: Merge "ndk: Refresh EGL/GLES Khronos headers"
* commit '7acb3cd1e53727473a7e7f326813b81232e905f3':
  ndk: Refresh EGL/GLES Khronos headers
2011-10-13 16:45:48 -07:00
David 'Digit' Turner
1fd1c38671 am 76008e67: Merge "ndk: remove obsolete <android/api-level.h> headers"
* commit '76008e67cedc5b732f7d64cf03ea2edc9be9c19a':
  ndk: remove obsolete <android/api-level.h> headers
2011-10-13 16:45:48 -07:00
David 'Digit' Turner
4b01f91996 am e3379eaf: Merge "ndk: Fix GB x86 definitions for libm.so"
* commit 'e3379eafdda57bab5fa3b19b3d5b0b6288524d54':
  ndk: Fix GB x86 definitions for libm.so
2011-10-13 16:45:48 -07:00
Jeff Sharkey
74767750b6 Add DownloadProvider tests.
Change-Id: I04941f49b08c6a381dadd6d9dd0bc90680491e8c
2011-10-12 13:45:25 -07:00
David 'Digit' Turner
7761beeb56 ndk: <time.h> Add missing clock_settime()/clock_nanosleep() declarations
Both functions are part of the C library since Android 1.5 / API level 3
but were missing a declaration in <time.h>, so add then here

+ Fix first parameter from 'int' to 'clockid_t' for clock_getres()
  and clock_gettime()

Fixes http://code.google.com/p/android/issues/detail?id=20140

Change-Id: Ic2191d5eb54475c149b9a6b8f3ba55bc8ed4643f
2011-10-12 03:43:29 +02:00
David 'Digit' Turner
b298c3bdc9 Merge "ndk: remove obsolete libthread_db.a binaries" 2011-10-11 18:10:50 -07:00