Commit Graph

8112 Commits

Author SHA1 Message Date
Glenn Kasten
ccdb9cb2b0 Update native-audio example app
Additions:
 - volume
 - stereo position
 - mute / solo
 - explicit pause / play / loop buttons
 - spinner for URI strings

Change-Id: I92f3a191f715567531d03998d4b80e32cc9aceed
2011-10-19 17:28:37 -07:00
David 'Digit' Turner
a8f182c105 Merge "emulator: opengl: add design document for emulation implementation." 2011-10-19 10:14:13 -07:00
David 'Digit' Turner
aafffde798 Merge "emulator: opengl: minor fix and reformatting" 2011-10-19 10:13:55 -07:00
David 'Digit' Turner
0e205e6d6e emulator: opengl: minor fix and reformatting
This patches fixes a minor invalid usage of delete (instead of delete[])
and reformats the source code a little to make it more obvious.

Change-Id: If853d12e74549abcc6682430c837b0f14da81fdc
2011-10-19 17:54:20 +02:00
David 'Digit' Turner
fb2ddf9347 emulator: opengl: add design document for emulation implementation.
This patch adds a rather extensive document explaining the design
of our OpenGLES emulation, both on the guest and the host.

Change-Id: I13cf1eac21e5a8a0be170b5f90100b04f9ae6d75
2011-10-19 16:43:24 +02:00
Eric Fischer
61533d2fe7 Merge "Import revised translations." 2011-10-18 16:27:14 -07:00
Eric Fischer
16436c5b06 Import revised translations.
Change-Id: I3543796a9c2269b632ee0209b88cd02f06d8a2f2
2011-10-18 15:01:17 -07:00
Vladimir Chtchetkine
0f1f20f6c3 am d4803d83: (-s ours) Merge "Cherry picked from c9a94b0f in master. Do not merge." into ics-mr0
* commit 'd4803d835198cc71514bfd93aa5e7602e6b0c0ba':
  Cherry picked from c9a94b0f in master. Do not merge.
2011-10-18 13:55:55 -07:00
Vladimir Chtchetkine
d4803d8351 Merge "Cherry picked from c9a94b0f in master. Do not merge." into ics-mr0 2011-10-18 13:53:59 -07:00
Dianne Hackborn
7661353ddd am 9860f7ac: Merge "Home should not be persistent." into ics-mr0
* commit '9860f7aca0510059c315f9e7fa10351e03193003':
  Home should not be persistent.
2011-10-18 13:43:59 -07:00
Dianne Hackborn
9860f7aca0 Merge "Home should not be persistent." into ics-mr0 2011-10-18 13:42:05 -07:00
Vladimir Chtchetkine
f7f6886820 Cherry picked from c9a94b0f in master. Do not merge.
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: Idb2dfc7c0a79e81eff58f83a14af769afc713096
2011-10-18 12:32:24 -07:00
Eric Fischer
91565ff67e am 00cd68e2: (-s ours) Import revised translations. DO NOT MERGE
* commit '00cd68e27f2e2ebf8221550728ec786299d3beae':
  Import revised translations.  DO NOT MERGE
2011-10-18 11:31:13 -07:00
Eric Fischer
00cd68e27f Import revised translations. DO NOT MERGE
Change-Id: I149ef88768a6ca412f23496ff53e989a4245140d
2011-10-18 11:06:12 -07:00
Vladimir Chtchetkine
c9a94b0f50 Merge "Implement CAMERA_MSG_PREVIEW_FRAME callback" 2011-10-18 07:17:43 -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
Dianne Hackborn
e7d00ac68b Home should not be persistent.
Change-Id: I3d124512069637c18651ef91801338b7300fee8c
2011-10-17 18:49:50 -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
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
009d3b25fa Merge "Added exposure compensation control for the fake camera." 2011-10-17 09:52:27 -07:00
Steve Block
3e9dae13d6 Merge "Fix use of WebView.loadData() to avoid passing invalid encoding" 2011-10-17 09:00:28 -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
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
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
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
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
8ece910f60 ndk: Update OpenSLES platform files for API level 14
Change-Id: I029b7eea0db05613389e8cd22b0440a56c850d53
2011-10-14 02:29:28 +02: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
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
David 'Digit' Turner
7acb3cd1e5 Merge "ndk: Refresh EGL/GLES Khronos headers" 2011-10-11 18:10:33 -07:00
David 'Digit' Turner
76008e67ce Merge "ndk: remove obsolete <android/api-level.h> headers" 2011-10-11 18:10:16 -07:00
David 'Digit' Turner
e3379eafdd Merge "ndk: Fix GB x86 definitions for libm.so" 2011-10-11 18:10:05 -07:00
David 'Digit' Turner
085e2b14d5 ndk: remove obsolete libthread_db.a binaries
We don't use these since NDK r5, since we now provide
customized versions of the library under
$NDK/sources/android/libthread_db

Change-Id: I2e3103b85c14e75a00ba9cece7a872d2156f5ef9
2011-10-12 03:07:48 +02:00
David 'Digit' Turner
0d7f537fea ndk: Refresh EGL/GLES Khronos headers
This patch updates the Khronos headers with updated version.
This mostly brings definitions (constants and types) related to
a bunch of new extensions. Since each extension is optional and
must be actively probed at runtime by the client program, this
doesn't change the NDK ABI at all. Moreover, which extension is
available depends on the specific hardware, not the Android system
version.

+ Define GLchar and GLvoid and adjust function signatures to
  use them instead of 'char' and 'void'

List of new extensions supported:

GLES 1.x
--------
GL_OES_vertex_array_object
GL_OES_EGL_image_external
GL_APPLE_texture_2D_limited_npot
GL_EXT_blend_minmax
GL_EXT_discard_framebuffer
GL_EXT_multi_draw_arrays
GL_EXT_read_format_bgra
GL_EXT_texture_filter_anisotropic
GL_EXT_texture_format_BGRA8888
GL_EXT_texture_lod_bias
GL_IMG_read_format
GL_IMG_texture_compression_pvrtc
GL_IMG_texture_env_enhanced_fixed_function
GL_IMG_user_clip_plane
GL_IMG_multisampled_render_to_texture
GL_NV_fence
GL_QCOM_driver_control
GL_QCOM_extended_get
GL_QCOM_extended_get2
GL_QCOM_perfmon_global_mode
GL_QCOM_writeonly_rendering
GL_QCOM_tiled_rendering

GLES 2.0
--------
GL_OES_element_index_uint
GL_OES_get_program_binary
GL_OES_mapbuffer
GL_OES_packed_depth_stencil
GL_OES_texture_3D
GL_OES_texture_float
GL_OES_texture_float_linear
GL_OES_texture_half_float_linear
GL_OES_texture_npot
GL_OES_vertex_array_object
GL_OES_EGL_image_external
GL_AMD_program_binary_Z400
GL_EXT_blend_minmax
GL_EXT_discard_framebuffer
GL_EXT_multi_draw_arrays
GL_EXT_read_format_bgra
GL_EXT_texture_format_BGRA8888
GL_EXT_texture_compression_dxt1
GL_IMG_program_binary
GL_IMG_read_format
GL_IMG_shader_binary
GL_IMG_texture_compression_pvrtc
GL_IMG_multisampled_render_to_texture
GL_NV_coverage_sample
GL_NV_depth_nonlinear
GL_QCOM_extended_get
GL_QCOM_extended_get2
GL_QCOM_writeonly_rendering
GL_QCOM_tiled_rendering

EGL:
----
EGL_ANDROID_recordable
EGL_NV_system_time

Change-Id: I26ae2aeb499539017cc35d0271f13bcfbf6f8a65
2011-10-12 03:07:48 +02:00