Commit Graph

8362 Commits

Author SHA1 Message Date
The Android Automerger
dd249d94bc merge in ics-release history after reset to master 2011-10-16 06:59:22 -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
The Android Automerger
9b0cf59c74 merge in ics-release history after reset to master 2011-10-12 06:59:40 -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
David 'Digit' Turner
c63ce7a143 ndk: remove obsolete <android/api-level.h> headers
These are now auto-generated by the gen-platforms.sh NDK script

Change-Id: I5a38e956b58a34c5db96e24f2a46bc1ca1554376
2011-10-12 03:07:48 +02:00
David 'Digit' Turner
4fee0994c3 ndk: Fix GB x86 definitions for libm.so
The previous header and implementation were incorrect and didn't produce
correct results. This has been fixed in the internal Gingerbread branch.

Technically, this could result in ABI breakage, but the chances are very
low, and there are no official x86 Gingerbread release yet.

Change-Id: I0b2d857399358775d1490b72a1b75baac362f839
2011-10-12 03:07:47 +02:00
The Android Automerger
27b6bdee57 merge in ics-release history after reset to master 2011-10-11 05:32:26 -07:00
Yu Shan Emily Lau
ab50fca4f0 Merge "Bug 5440088 Turn off the bugreport catpure by default." 2011-10-10 20:30:11 -07:00
Yu Shan Emily Lau
08fa5ef66f Bug 5440088 Turn off the bugreport catpure
by default.

Swith the mGetPeriodicBugreport default
value to false so that the bugreport
will not be captured by default.

Change-Id: Ieae662478d865d9a49dec4f77f52046b560c8972
2011-10-10 19:40:22 -07:00
David 'Digit' Turner
28f0525172 Merge "ndk: Remove obsolete API level 11 platform files" 2011-10-10 13:02:08 -07:00
David 'Digit' Turner
58064314d0 Merge "ndk: Remove obsolete platform files" 2011-10-10 13:01:59 -07:00
David 'Digit' Turner
95b2dfea7e Merge "ndk: separate functions and variables symbol lists" 2011-10-10 13:01:44 -07:00
David 'Digit' Turner
985433be6c ndk: Remove obsolete API level 11 platform files
Change-Id: I95b0952722e1312c46ef02912407b81ea8c1b198
2011-10-10 21:52:17 +02:00
David 'Digit' Turner
e872f4e101 ndk: Remove obsolete platform files
Remove the prebuilt system shared libraries and unified symbol files
from development/ndk. We don't need them anymore:

  - the unified symbol files are replaced by separate functions/variables
    symbol list, which were added in a previous commit, i.e.:

	libc.so.txt  --> libc.so.functions.txt
	                 libc.so.variables.txt

 - the shared libraries are now generated on the fly by the NDK
   gen-platforms.sh script, from the functions/variables symbol lists.

Note that we need to keep the static libraries and runtime objects,
they are required to build the cross-toolchains and target binaries.

Change-Id: Ifa0a7f2d741ed32b80216561ca3f17e67df06ce9
2011-10-10 21:52:17 +02:00
David 'Digit' Turner
02053eb7a1 ndk: separate functions and variables symbol lists
This change introduces separate symbol lists for functions
and variables of each NDK system shared library.

Note that we don't remove the unified symbol files yet. This
will be done later when we complete other changes under ndk/,
namely the ability to generate platforms trees containing shell
libraries generated directly from them.

These files were generated using the following:

  cd development/ndk
  for DIR in platforms/*/*/lib; do
    for ARCH in arm x86; do
      $NDK/build/tools/gen-system-symbols $DIR $DIR/../symbols
    done
  done

This means that the symbol lists were generated by parsing the
existing prebuilt shared libraries under platforms/ and extracting
their function and variable names.

Change-Id: Ie1e791d98260a7f0d8d2e9f71323a7ea448f2dd4
2011-10-10 21:52:09 +02:00
The Android Automerger
dea5a304cc merge in ics-release history after reset to master 2011-10-09 06:59:33 -07:00
Robert Ly
f07fbe5881 Merge "fix RSBalls to be minSDK=14" 2011-10-07 15:31:22 -07:00
Winson Chung
f7dc8e5d09 Merge "Updating the sample widget with some better resources." 2011-10-07 14:03:11 -07:00
Winson Chung
cbb321fc8c Updating the sample widget with some better resources.
Change-Id: I74192f00b2f539c3431f3c327575f0e99f907be8
2011-10-07 13:48:54 -07:00
Adam Cohen
7fd48dd180 Merge "Cleaning up the stack sample widget" 2011-10-07 13:18:26 -07:00
Adam Cohen
6293583f9a Cleaning up the stack sample widget
Change-Id: Ie5d1bcacb1943e87c0517b6e38cad1598e119f7d
2011-10-07 11:27:16 -07:00
Robert Ly
9b20402482 fix RSBalls to be minSDK=14
Change-Id: I7e1f2d08e7172de4d5c6a29b4ca1e5cff42e2a14
2011-10-07 10:59:05 -07:00
Roman Nurik
dd147febf3 Merge "Update _index.html in RandomMusicPlayer sample for ICS" 2011-10-06 18:23:29 -07:00
Roman Nurik
c0aeb67784 Update _index.html in RandomMusicPlayer sample for ICS
Change-Id: I52872e491d9b5976264eb4fd87640be50e5ebc3d
2011-10-06 18:17:41 -07:00
Philip Milne
875cd1c602 Move GridLayout1/2 to here from GridLayoutTest in frameworks/base.
Change-Id: Iff31b918a3fdf599a356107a418e056cf5663142
2011-10-06 17:15:11 -07:00
Chet Haase
b19c468208 Merge "Clean up LayoutTransition demos for smaller screens." 2011-10-06 14:32:35 -07:00
Chet Haase
976d6ceb73 Clean up LayoutTransition demos for smaller screens.
These demos assumed the size of a tablet device and looked pretty
awful on phones.

Change-Id: I246ef5a5f4619c1f2fe689eca321314375722014
2011-10-06 12:46:00 -07:00
Roman Nurik
69ad161520 Merge "Update RandomMusicPlayer sample for new RemoteControlClient APIs, also add media button support" 2011-10-06 10:11:23 -07:00