Commit Graph

7433 Commits

Author SHA1 Message Date
Jake Hamby
ad716fc412 Exclude some non-source folders from IntelliJ projects.
Add some excludeFolder lines to android.iml generated by idegen.sh.
This removes a large number of non-Java files that IntelliJ would
otherwise have to stat and parse.

Change-Id: I362711daba6cc0c7ebec761d013c57c27a29d58d
2011-08-09 16:00:35 -07:00
Daniel Lehmann
a6826891f9 Merge "Start service intent when contact is being displayed" 2011-08-09 14:49:58 -07:00
Daniel Lehmann
af2e1dccbc Start service intent when contact is being displayed
Bug:5138185
Change-Id: I32e239e4af564bb876d1eb021f31b2fd6287feaf
2011-08-09 13:42:08 -07:00
David 'Digit' Turner
2a3bcf93a0 am 44d6a0fa: am 4e9cf45c: am 891ad0e8: Merge "emulator: opengl: Make render_api.h C-compatible"
* commit '44d6a0fa6f828f2196dd5a39ca80eff9c2db0922':
  emulator: opengl: Make render_api.h C-compatible
2011-08-09 13:37:28 -07:00
David Turner
5647257e6e am 3374f8ad: am 254a7090: am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98
* commit '3374f8ad2cd4fcff7ab40bd80672b8b380242c84':
  NDK: x86 header file has incorrect definition for ptrdiff_t
  Fix size_t definition in x86 NDK header file
2011-08-09 13:37:17 -07:00
Debashish Chatterjee
a583cd15f7 Merge "VoicemaiProviderDemoApp changed to use api from sdk." 2011-08-09 00:07:33 -07:00
Chet Haase
e3239b8d24 Fix fill behavior in an old AnimationSet demo.
FillEnabled/FillBefore/FillAfter have somewhat non-intuitive behavior.
The demo didn't work at all as intended, so I changed the animation resource
to reflect the actual behavior desired (delay starting the child animations
in the inner AnimationSet and avoid having those animations set the transform
before they start)

Change-Id: I135842091902ba243851dad0104f86e1b8605053
2011-08-08 16:30:34 -07:00
Debashish Chatterjee
d407959ada VoicemaiProviderDemoApp changed to use api from sdk.
Voicemail content provider APIs are now part of the SDK. This CL gets
rid of the local copy of VoicemailContracts and instead uses the APIs
from the SDK.

Key differences between the old and latest APIs
- voicemail permission renamed from READ_WRITE_OWN_VOICEMAILS to
  ADD_VOICEMAIL
- voicemail state is a hidden field, so not part of the API. Demo app
  should not use it.
- Use IS_READ field instead of NEW.

Change-Id: Ib142eb02bb89eed32a7976b66132893a98aba466
2011-08-08 17:58:40 +01:00
David 'Digit' Turner
44d6a0fa6f am 4e9cf45c: am 891ad0e8: Merge "emulator: opengl: Make render_api.h C-compatible"
* commit '4e9cf45cbda52fb04e77f7917eb1abb31ff1b851':
  emulator: opengl: Make render_api.h C-compatible
2011-08-05 09:42:55 -07:00
David 'Digit' Turner
4e9cf45cbd am 891ad0e8: Merge "emulator: opengl: Make render_api.h C-compatible"
* commit '891ad0e8e203d438cb6084525137e066b47671fd':
  emulator: opengl: Make render_api.h C-compatible
2011-08-05 09:41:20 -07:00
David 'Digit' Turner
891ad0e8e2 Merge "emulator: opengl: Make render_api.h C-compatible" 2011-08-05 09:23:54 -07:00
David Turner
3374f8ad2c am 254a7090: am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98
* commit '254a709075bc78250b28d8dc34e859821d6499b6':
  NDK: x86 header file has incorrect definition for ptrdiff_t
  Fix size_t definition in x86 NDK header file
2011-08-05 08:02:33 -07:00
David Turner
254a709075 am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98
* commit '0f97bab8f00d37409bb7f3c3f7644a16e7cbbbb0':
  NDK: x86 header file has incorrect definition for ptrdiff_t
  Fix size_t definition in x86 NDK header file
2011-08-05 08:00:24 -07:00
David Turner
0f97bab8f0 Merge changes Ibee74a22,Ifef4dc98
* changes:
  NDK: x86 header file has incorrect definition for ptrdiff_t
  Fix size_t definition in x86 NDK header file
2011-08-05 07:51:59 -07:00
David 'Digit' Turner
3a064ab539 emulator: opengl: Make render_api.h C-compatible
This change modifies the function declarations under
developement/tools/emulator/opengl/host/include/render_api.h
to make them callable from C.

This is preparation work for integrating the rendering library
into the emulator. The plan is to dlopen() the library dynamically
and using non-mangled function names makes using dlsym() both
easier and more portable.

Change-Id: I34656ea4618dbb989fb6ff78df43e9bfb38a7799
2011-08-05 16:28:01 +02:00
Daniel Sandler
a131fa0b3a Merge "Demonstration of the various fullscreen modes:" 2011-08-04 19:28:04 -07:00
Iliyan Malchev
4929d6a562 development: copy stack tool over from vendor/google/tools
The stack tool is not really proprietary, and is needed by vendors and
third-party developers working on native code.

Change-Id: I37f34b0681a0063ecf71f5a078d2c4a1ba622973
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-08-04 17:44:40 -07:00
Mark D Horn
f907f4f9d4 NDK: x86 header file has incorrect definition for ptrdiff_t
See Bug http://code.google.com/p/android/issues/detail?id=19042

Change-Id: Ibee74a22ca8cb1e62b7a6faff01291c6c7a56775
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
2011-08-04 17:11:15 -07:00
David Hu
621770b177 Merge "GPS Location Test" 2011-08-04 16:56:31 -07:00
John Huang
2a83af6ba1 Merge "Removed Launcher2_intermediates from .classpath" 2011-08-04 15:18:06 -07:00
David Hu
8bf6664898 GPS Location Test
Verify that the previously set GPS Location via geo fix command
is set properly.

Change-Id: If160a8379d93a813402bf8622b279feac4f5f110
2011-08-04 14:51:23 -07:00
Daniel Sandler
173fb98b2d Demonstration of the various fullscreen modes:
FLAG_FULLSCREEN,
  SYSTEM_UI_FLAG_LOW_PROFILE,
  SYSTEM_UI_FLAG_HIDE_NAVIGATION.

Bug: 5052456
Change-Id: I3c23caa83a66b585ae1102e3d473f6e4f096840d
2011-08-04 16:47:02 -04:00
David Turner
093099438e am 2d499287: am f8e76503: am 3e6fbdd1: Merge "2.0 translator: link only if both shaders compile"
* commit '2d49928731026af2eefcf645bf65fe6d61b24744':
  2.0 translator: link only if both shaders compile
2011-08-04 07:31:27 -07:00
David Turner
225c68ec22 am 157fffcf: am efdf94f7: am 0ecd4791: Merge "opengl translator: Added GLSL ES builtin constants."
* commit '157fffcf18177b78b93afb30aeff7643a7ecb69c':
  opengl translator: Added GLSL ES builtin constants.
2011-08-04 07:31:25 -07:00
David Turner
cb6dbb00ed am e7e0e372: am b1bbce7c: am bcd5ebd9: Merge "1.1 translator: WAR for GL_ALPHA_TEST_REF bug"
* commit 'e7e0e372a62ae7e77c477900e078027a272b6d33':
  1.1 translator: WAR for GL_ALPHA_TEST_REF bug
2011-08-04 07:31:22 -07:00
David Turner
a8c9a79640 am 2cdb34a2: am ddf8192f: am dba3c8bc: Merge "1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6"
* commit '2cdb34a242d2a1767390301d04779f813b208cea':
  1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6
2011-08-04 07:31:20 -07:00
David Turner
1d1f4c879b am 4b0efb56: am 2abeceb7: am a80ddadf: Merge "remove NV_WAR defines"
* commit '4b0efb567936afdc46726fba606a7cba935427f8':
  remove NV_WAR defines
2011-08-04 07:31:16 -07:00
David Turner
2d49928731 am f8e76503: am 3e6fbdd1: Merge "2.0 translator: link only if both shaders compile"
* commit 'f8e76503041d484703a1bb7a64f86b3fe4497393':
  2.0 translator: link only if both shaders compile
2011-08-04 07:27:06 -07:00
David Turner
157fffcf18 am efdf94f7: am 0ecd4791: Merge "opengl translator: Added GLSL ES builtin constants."
* commit 'efdf94f7cc875f3dd66036f5962cf70802628ed1':
  opengl translator: Added GLSL ES builtin constants.
2011-08-04 07:27:04 -07:00
David Turner
e7e0e372a6 am b1bbce7c: am bcd5ebd9: Merge "1.1 translator: WAR for GL_ALPHA_TEST_REF bug"
* commit 'b1bbce7cc8cc8b8c38dedac62aa5190164ee1338':
  1.1 translator: WAR for GL_ALPHA_TEST_REF bug
2011-08-04 07:27:02 -07:00
David Turner
2cdb34a242 am ddf8192f: am dba3c8bc: Merge "1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6"
* commit 'ddf8192faaae61b7d3b7a7cdad465e2f48974648':
  1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6
2011-08-04 07:27:00 -07:00
David Turner
4b0efb5679 am 2abeceb7: am a80ddadf: Merge "remove NV_WAR defines"
* commit '2abeceb76408d8645836b3efe274de8c0c5b5d2d':
  remove NV_WAR defines
2011-08-04 07:26:56 -07:00
David Turner
f8e7650304 am 3e6fbdd1: Merge "2.0 translator: link only if both shaders compile"
* commit '3e6fbdd1b286e09a153b68b74fb12bda9df9b0e8':
  2.0 translator: link only if both shaders compile
2011-08-04 07:23:55 -07:00
David Turner
efdf94f7cc am 0ecd4791: Merge "opengl translator: Added GLSL ES builtin constants."
* commit '0ecd4791c86d33497b89c104dc25e046ade033f9':
  opengl translator: Added GLSL ES builtin constants.
2011-08-04 07:23:53 -07:00
David Turner
b1bbce7cc8 am bcd5ebd9: Merge "1.1 translator: WAR for GL_ALPHA_TEST_REF bug"
* commit 'bcd5ebd98c203805c88eb5dad9edb0c24bbcee63':
  1.1 translator: WAR for GL_ALPHA_TEST_REF bug
2011-08-04 07:23:51 -07:00
David Turner
ddf8192faa am dba3c8bc: Merge "1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6"
* commit 'dba3c8bc91e634ae14ff2a5aef5ab41cecec2cc2':
  1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6
2011-08-04 07:23:49 -07:00
David Turner
2abeceb764 am a80ddadf: Merge "remove NV_WAR defines"
* commit 'a80ddadf037e491c997b17da58ea08219eb21bd7':
  remove NV_WAR defines
2011-08-04 07:23:46 -07:00
David Turner
3e6fbdd1b2 Merge "2.0 translator: link only if both shaders compile" 2011-08-04 07:10:38 -07:00
Amit Feller
25b3794419 2.0 translator: link only if both shaders compile
A program should be linked only if both vertex and fragment shaders
compiled succesfully.
Change-Id: I9793da85847fd606883e1e3bef05485ce6037c21
2011-08-04 16:10:12 +02:00
David Turner
0ecd4791c8 Merge "opengl translator: Added GLSL ES builtin constants." 2011-08-04 07:09:25 -07:00
David Turner
bcd5ebd98c Merge "1.1 translator: WAR for GL_ALPHA_TEST_REF bug" 2011-08-04 07:09:16 -07:00
David Turner
dba3c8bc91 Merge "1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6" 2011-08-04 07:09:06 -07:00
David Turner
a80ddadf03 Merge "remove NV_WAR defines" 2011-08-04 07:08:52 -07:00
Guy Zadickario
e8c7a055f7 opengl translator: Added GLSL ES builtin constants.
Adds GLSL built in constants defined in GLSL ES but not in GLSL.
Makes biConstant conformance test to pass on Mac (where ES2_compatability is not
present).

Also fixed the GLSL parser to insert our additions to the shader
only after the "#version" token if exist in the original shader.
Also renamed env var GOOGLE_GLES_FORCE_GLSL_VERSION to
GOOGLE_GLES_DEFAULT_GLSL_VERSION to better match its functionality since
we use it only if no specific version exist in the shader code.

Change-Id: If9485da16da2808245943a7295f8fb22a6f631aa
2011-08-04 12:01:49 +02:00
Yochai Shefi Simchon
7e04a2421c 1.1 translator: WAR for GL_ALPHA_TEST_REF bug
Both the ATI and nVidia OpenGL drivers return the wrong answer on
glGetIntegerv(GL_ALPHA_TEST_REF). So Implement this functionality
in our code.

Change-Id: I022b1475f7edb9f1d0f48ebcaf9f6e9f5c4f344e
2011-08-04 12:01:49 +02:00
Yochai Shefi Simchon
926db88dd1 1.1 translator: glGet(GL_MAX_CLIP_PLANES) returns max 6
This is a WAR for an ATI OpenGL driver bug.

Change-Id: I0b54317873ed8c60fe835a993c2c8f32321ff8e2
2011-08-04 12:01:49 +02:00
Liran
ceb7fc9140 remove NV_WAR defines
enable workarounds by default
added environemnt variable GOOGLE_GLSL_FORCE_GLES_VERSION
to the shader parser

Change-Id: If1dbc10722436659295c40a40bd630a72e575799
2011-08-04 12:01:49 +02:00
Luca Zanolin
37a152d1ae Merge "Show how to use broadcast for accessing voice search settings." 2011-08-04 02:51:50 -07:00
Luca Zanolin
50b7e75061 Show how to use broadcast for accessing voice search settings.
Change-Id: Ie17e377cd1814b58e00a56e8dfb84fc66cd88985
2011-08-04 09:50:21 +01:00
Xavier Ducrohet
d8245ecdb1 am e4354ba7: resolved conflicts for merge of d2819621 to honeycomb-plus-aosp
* commit 'e4354ba71e9ac21ff4e6864da7287db472c50e84':
  move platform tools to r8.
2011-08-03 18:16:39 -07:00