Commit Graph

1168 Commits

Author SHA1 Message Date
Mathias Agopian
b1a39d67be Added most of the support needed for GLES 2.x 2009-05-27 20:38:06 -07:00
Mathias Agopian
a3d66a834f minor modifications to the official GLES 2.x headers
- changed glTexImage2D() declaration so it matches that of GLES 1.x; otherwise we can't include both headers (!!!)
- added parameter names to the declaration of some extensions (this is needed by glapigen and glentrygen)
2009-05-27 20:32:20 -07:00
Mathias Agopian
48efd95015 add GLES 2.x headers 2009-05-27 20:31:18 -07:00
Mathias Agopian
bed9dd128d make sure the Region code disallows constructs like "(a+b)=c;", which is somewhat meaningless. 2009-05-27 17:01:58 -07:00
Mathias Agopian
4b8160fdfd oops forgot these changes in the previous merge. fixes build 2009-05-27 15:02:35 -07:00
Mathias Agopian
723ec00af4 Merge commit 'goog/master' into merge_master
Conflicts:
	include/ui/Rect.h
	libs/ui/ISurfaceComposer.cpp
2009-05-27 14:34:50 -07:00
Android (Google) Code Review
39afd5f7da Merge change 2541
* changes:
  Turn on ACC script test. (It works!)
2009-05-27 12:50:20 -07:00
Android (Google) Code Review
8b77bff42a am 004cb73a: Merge change 2443 into donut
Merge commit '004cb73a152327160614318fef0e1800ec91346d'

* commit '004cb73a152327160614318fef0e1800ec91346d':
  Adding proxy class to communicate with the TTS service through the ITts interface.
2009-05-27 11:20:54 -07:00
Android (Google) Code Review
253dd5cb26 Merge change 2443 into donut
* changes:
  Adding proxy class to communicate with the TTS service through the ITts interface.
2009-05-27 11:04:48 -07:00
Android (Google) Code Review
b4cf5e829e am a64f5f61: Merge change 1124 into donut
Merge commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb'

* commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb':
  Fix SQLite limit issue.
2009-05-27 11:01:30 -07:00
Android (Google) Code Review
327e140f9e Merge change 1124 into donut
* changes:
  Fix SQLite limit issue.
2009-05-27 10:56:41 -07:00
Android (Google) Code Review
8b1fb3cdd1 Merge change 2503
* changes:
  Stop the NANP number formatter from putting dashes in shortcodes.
2009-05-27 10:55:57 -07:00
Marco Nelissen
428c2d3046 am 8ae3f619: Fix another crash in Gestures, this one caused by the data file having the wrong version. I made the loader print a message to the log for this, and made the calling code disable gestures for the listview instead of crashing.
Merge commit '8ae3f6190244156bc6e750680654057bd7816309'

* commit '8ae3f6190244156bc6e750680654057bd7816309':
  Fix another crash in Gestures, this one caused by the data file
2009-05-27 10:42:13 -07:00
Jean-Michel Trivi
1cfc02fbb9 Adding proxy class to communicate with the TTS service through the ITts interface. 2009-05-27 10:36:30 -07:00
Android (Google) Code Review
70da79454a am f0e7e4a9: Merge change 2520 into donut
Merge commit 'f0e7e4a9461ab3daf57ecfec3d25be583380d0d2'

* commit 'f0e7e4a9461ab3daf57ecfec3d25be583380d0d2':
  Cause the icon drawables to animate automatically by calling setVisible
2009-05-27 09:16:01 -07:00
Android (Google) Code Review
0e8e0b7fd7 Merge change 2520 into donut
* changes:
  Cause the icon drawables to animate automatically by calling setVisible false and then true on the drawables. For an AnimationDrawable, this will trigger the desired behavior of 'automatically' starting the animation, which should have been working to begin with according to the intended design of AnimationDrawable (see http://b/1878430 for my description of my correspondence with Romain). For Donut we'll just do this to work around it, but for a later release we need to decide a better story.
2009-05-27 09:13:15 -07:00
Android (Google) Code Review
75cb9e7a51 am ed6e0b92: Merge change 2522 into donut
Merge commit 'ed6e0b92dd8a42a67d0ffd5cb62d69a65dfcd051'

* commit 'ed6e0b92dd8a42a67d0ffd5cb62d69a65dfcd051':
  This function should be public
2009-05-27 05:54:13 -07:00
Android (Google) Code Review
334e419e67 Merge change 2522 into donut
* changes:
  This function should be public
2009-05-27 05:52:50 -07:00
Android (Google) Code Review
6ceee188a6 am c0139711: Merge change 2432 into donut
Merge commit 'c0139711b0e4a07ad997fb4130c674ed2d90e2fc'

* commit 'c0139711b0e4a07ad997fb4130c674ed2d90e2fc':
  Make android_runtime to not include libemoji but use dlopen() instead.
2009-05-27 04:50:13 -07:00
Android (Google) Code Review
71fe2d3f4d Merge change 2432 into donut
* changes:
  Make android_runtime to not include libemoji but use dlopen() instead. This must be submitted with change 2432
2009-05-27 04:48:21 -07:00
Android (Google) Code Review
c3bb42f1b8 am 298784cd: Merge change 2420 into donut
Merge commit '298784cd8a7ed77923bdb51de38c15e4c246a037'

* commit '298784cd8a7ed77923bdb51de38c15e4c246a037':
  This just makes it easier to derive from ApplicationErrorReport.
2009-05-27 02:19:21 -07:00
Android (Google) Code Review
38cb90b8da Merge change 2420 into donut
* changes:
  This just makes it easier to derive from ApplicationErrorReport.
2009-05-27 02:17:21 -07:00
Android (Google) Code Review
610d9e17fc Merge change 2007
* changes:
  New BluetoothSocket API.
2009-05-26 19:47:08 -07:00
Android (Google) Code Review
169ae78dda am 2a4daf06: Merge change 2508 into donut
Merge commit '2a4daf06fb36ff932f9d52962284ba369cee1ce0'

* commit '2a4daf06fb36ff932f9d52962284ba369cee1ce0':
  Activity Manager changes the scheduling group of processes.
2009-05-26 19:01:39 -07:00
Android (Google) Code Review
5ec8e797cc Merge change 2508 into donut
* changes:
  Activity Manager changes the scheduling group of processes.
2009-05-26 18:59:36 -07:00
Android (Google) Code Review
2787dddcd0 am 0c0ad39c: Merge change 2502 into donut
Merge commit '0c0ad39cd8eaa6de6b7f99cec3971bcc953461e0'

* commit '0c0ad39cd8eaa6de6b7f99cec3971bcc953461e0':
  minor clean-up to Rect and Point.
2009-05-26 18:15:53 -07:00
Android (Google) Code Review
5208ec29db Merge change 2502 into donut
* changes:
  minor clean-up to Rect and Point.
2009-05-26 18:14:14 -07:00
Android (Google) Code Review
ea44d9ab96 am eba9fe3f: Merge change 2492 into donut
Merge commit 'eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71'

* commit 'eba9fe3f8e3c6cf448183678a1b2a9987ce4ac71':
  add Gservices setting for "send message using bareJid timeout".
2009-05-26 18:03:07 -07:00
Android (Google) Code Review
ed9e5cb30b Merge change 2492 into donut
* changes:
  add Gservices setting for "send message using bareJid timeout".
2009-05-26 18:02:08 -07:00
Android (Google) Code Review
aa3be062b9 Merge change 2501
* changes:
  Fix RenderScript JNI code build issue.
2009-05-26 17:57:37 -07:00
Mathias Agopian
35801cea5f minor clean-up to Rect and Point.
- return "const" objects for overloaded operators to disallow constructs like: (a+b) = c;
- don't return references to non-static members, it's not always safe.
- Point.cpp was empty, so get rid of it
2009-05-26 17:47:39 -07:00
Dirk Dougherty
d105cf075a am c29df57e: am 522ab34d: AI 149272: Mark 1.5r1 as a "non-current" release, with pointer to 1.5r2. BUG=1790234
Merge commit 'c29df57e5abb09c7e1ceed153e8f2b906f522d7b'

* commit 'c29df57e5abb09c7e1ceed153e8f2b906f522d7b':
  AI 149272: Mark 1.5r1 as a "non-current" release, with pointer to 1.5r2.
2009-05-26 17:01:04 -07:00
Dirk Dougherty
7419ebc96f am 522ab34d: AI 149272: Mark 1.5r1 as a "non-current" release, with pointer to 1.5r2. BUG=1790234
Merge commit '522ab34d3821dc760e10f4bdf3fbdb558c6a1d01' into donut

* commit '522ab34d3821dc760e10f4bdf3fbdb558c6a1d01':
  AI 149272: Mark 1.5r1 as a "non-current" release, with pointer to 1.5r2.
2009-05-26 16:59:33 -07:00
Android (Google) Code Review
536e7ee59c am f3288f17: Merge change 2468 into donut
Merge commit 'f3288f178ae2b2c7910b234f54f43475a83eb860'

* commit 'f3288f178ae2b2c7910b234f54f43475a83eb860':
  setVolume did not check interface descriptor
2009-05-26 16:25:36 -07:00
Android (Google) Code Review
fd7e2f74d2 Merge change 2468 into donut
* changes:
  setVolume did not check interface descriptor DO NOT MERGE
2009-05-26 16:23:08 -07:00
Mathias Agopian
83c0446f27 some work to try to reduce the code size of some native libraries
- make sure that all binder Bn classes define a ctor and dtor in their respective library.
  This avoids duplication of the ctor/dtor in libraries where these objects are instantiated.
  This is also cleaner, should we want these ctor/dtor to do something one day.

- same change as above for some Bp classes and various other non-binder classes

- moved the definition of CHECK_INTERFACE() in IInterface.h instead of having it everywhere.

- improved the CHECK_INTERFACE() macro so it calls a single method in Parcel, instead of inlining its code everywhere

- IBinder::getInterfaceDescriptor() now returns a "const String16&" instead of String16, which saves calls to String16 and ~String16

- implemented a cache for BpBinder::getInterfaceDescriptor(), since this does an IPC. HOWEVER, this method never seems to be called.
  The cache makes BpBinder bigger, so we need to figure out if we need this method at all.
2009-05-26 16:12:20 -07:00
Android (Google) Code Review
5f2397488a Merge change 2355
* changes:
  add Gservices setting for "send message using bareJid timeout".
2009-05-26 15:52:48 -07:00
Dirk Dougherty
0f533a6e2b am fdacdcb6: am 1d6cb270: AI 149267: Add the images for icon guidelines doc BUG=1790234
Merge commit 'fdacdcb6546b976b437dfc97e286cd1733e7bf93'

* commit 'fdacdcb6546b976b437dfc97e286cd1733e7bf93':
  AI 149267: Add the images for icon guidelines doc
2009-05-26 15:06:19 -07:00
Android (Google) Code Review
3b3631301d am d22c64f3: Merge change 2434 into donut
Merge commit 'd22c64f377532969e61ec319f3b9f8a179ae8d47'

* commit 'd22c64f377532969e61ec319f3b9f8a179ae8d47':
  Removed Matrix from spatial sampling for GestureUtilities
2009-05-26 15:04:26 -07:00
Dirk Dougherty
8f5c7f12db am 1d6cb270: AI 149267: Add the images for icon guidelines doc BUG=1790234
Merge commit '1d6cb270a53e45e6370dfdd60954269c76b09d28' into donut

* commit '1d6cb270a53e45e6370dfdd60954269c76b09d28':
  AI 149267: Add the images for icon guidelines doc
2009-05-26 15:03:43 -07:00
Android (Google) Code Review
27e75bef99 Merge change 2434 into donut
* changes:
  Removed Matrix from spatial sampling for GestureUtilities - updated the letter training file
2009-05-26 15:02:59 -07:00
Android (Google) Code Review
ba2ddb4775 am 9762b533: Merge change 2465 into donut
Merge commit '9762b53352edc4cc8a6bc091930fc53dedcfe1e7'

* commit '9762b53352edc4cc8a6bc091930fc53dedcfe1e7':
  Fix crash in GestureOverlayView
2009-05-26 14:41:49 -07:00
Android (Google) Code Review
0767349f88 Merge change 2465 into donut
* changes:
  Fix crash in GestureOverlayView
2009-05-26 14:40:45 -07:00
Android (Google) Code Review
54ed1423ab Merge change 2466
* changes:
  Rename Calc sample to Fountain.
2009-05-26 14:28:02 -07:00
Android (Google) Code Review
8940878975 Merge change 2462
* changes:
  Add sprite fountain test.
2009-05-26 13:49:33 -07:00
Jaikumar Ganesh
2fcd34870c am cf2119a9: Check for desiredPowerState (airplane mode) before setting up data.
Merge commit 'cf2119a9755d9e2713ce78e84d0826d430a11a62'

* commit 'cf2119a9755d9e2713ce78e84d0826d430a11a62':
  Check for desiredPowerState (airplane mode) before setting up data.
  Remove dimmed background (and accompanying animation) for global
2009-05-26 12:55:34 -07:00
Android (Google) Code Review
44d1497418 Merge change 2446
* changes:
  Fix sim-eng build.
2009-05-26 12:38:46 -07:00
Andy McFadden
19deced119 Fix sim-eng build. 2009-05-26 12:06:31 -07:00
Android (Google) Code Review
46b9bca800 Merge change 1876
* changes:
  fix warning where we were boxing and int, only to have it automatically unboxed
2009-05-26 10:46:04 -07:00
Android (Google) Code Review
7b8ca6fa1c Merge change 2393 into donut
* changes:
  Remove dimmed background (and accompanying animation) for global search, since we should never really see that background anyway, and I suspect the animation is using a significant amount of CPU.
2009-05-26 10:33:55 -07:00