Commit Graph

204 Commits

Author SHA1 Message Date
Evan Millar
4482d8c8e4 Merge branch 'readonly-p4-donut' into donut 2009-04-18 12:27:51 -07:00
Evan Millar
c64edde69d AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=1755458

Automated import of CL 146853
2009-04-18 12:26:32 -07:00
Android (Google) Code Review
e8fbb001a4 Merge change 233 into donut
* changes:
  Add an Android-specific static OpenGL ES 1.1 Java API.
2009-04-16 17:55:44 -07:00
Jack Palevich
27f8002e59 Add an Android-specific static OpenGL ES 1.1 Java API.
This change adds four new public classes that expose a static OpenGL ES 1.1 API:

	android.opengl.GLES10
	android.opengl.GLES10Ext
	android.opengl.GLES11
	android.opengl.GLES11Ext

Benefits:

 + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
 + The static API is similar to the C API, which should make it easier to import C-based
   example code.
 + The static API provides a clear path for adding new OpenGL ES 1.1 extensions
   and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.

Example:

  import static android.opengl.GLES10.*;

  ...

  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.

Implementation details:

This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.

As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
2009-04-16 15:20:55 -07:00
Brandon Ballinger
3385e728d8 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:33:04 -07:00
Brandon Ballinger
181a44dd81 AI 146613: Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Automated import of CL 146613
2009-04-16 14:31:48 -07:00
Tammo Spalink
e564b19ed2 replaced integer * and % with shift operations, for performance 2009-04-16 14:48:19 +08:00
Android (Google) Code Review
e2393c5792 Merge changes 108,130,131 into donut
* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config
2009-04-14 14:40:02 -07:00
Android (Google) Code Review
4602d022ba Merge change 109 into donut
* changes:
  Remove references to android.util.Config
2009-04-14 14:39:51 -07:00
Android (Google) Code Review
be2355988d Merge change 154 into donut
* changes:
  gps: Add support for bringing up a GSM data connection on demand for SUPL.
2009-04-14 13:36:33 -07:00
Mike Lockwood
58bda98766 gps: Add support for bringing up a GSM data connection on demand for SUPL.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-14 16:25:07 -04:00
Android (Google) Code Review
b0d4a3502e Merge change 133 into donut
* changes:
  Initial code for cdma sms encode and decode, in java, with simple tests.
2009-04-14 13:20:43 -07:00
Android (Google) Code Review
ab6f5c6e86 Merge change 142 into donut
* changes:
  telephony: Add support for bringing up GSM data connections for GPS SUPL.
2009-04-14 12:52:28 -07:00
Mike Lockwood
42ad56ead4 telephony: Add support for bringing up GSM data connections for GPS SUPL.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-14 14:58:29 -04:00
Ramanan Rajeswaran
407d69c826 Merge branch 'readonly-p4-donut' into donut 2009-04-14 11:07:13 -07:00
Ramanan Rajeswaran
c14b0f8295 AI 146145: am: CL 146144 Set default map location for Ireland and South Africa
Original author: ramanan
  Merged from: //branches/cupcake/...

Automated import of CL 146145
2009-04-14 10:41:57 -07:00
Ramanan Rajeswaran
bd82eedf97 Merge branch 'readonly-p4-donut' into donut 2009-04-14 09:48:58 -07:00
Ramanan Rajeswaran
9909798b8e AI 146129: am: CL 146127 Increase zoom level for NZ default maps location
Original author: ramanan
  Merged from: //branches/cupcake/...

Automated import of CL 146129
2009-04-14 09:47:42 -07:00
Tammo Spalink
83917db040 Initial code for cdma sms encode and decode, in java, with simple tests.
(direct cherry-pick of master 42/42/8)
2009-04-14 10:01:23 +08:00
Eric Shienbrood
308618fa9d Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:14:07 -07:00
Eric Shienbrood
9900127828 AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  Original author: ers
  Merged from: //branches/cupcake/...

Automated import of CL 145980
2009-04-13 18:12:47 -07:00
Dave Bort
34f1ca7b79 util/DebugUtils: Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-13 17:18:45 -07:00
Dave Bort
76c0226008 text: Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-13 17:17:21 -07:00
Dave Bort
b1d0403c66 Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-13 15:12:30 -07:00
Dave Bort
42bc2ff5d2 Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-13 15:10:38 -07:00
Android (Google) Code Review
61805637e5 Merge change 65 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:13:14 -07:00
Android (Google) Code Review
2ee5b4d82b Merge change 64 into donut
* changes:
  Remove references to android.util.Config
2009-04-13 14:13:00 -07:00
Lorenzo Colitti
b7c3675aef Merge branch 'readonly-p4-donut' into donut 2009-04-13 13:54:13 -07:00
Lorenzo Colitti
e8624dd69d AI 145920: Don't filter out IPv6 multicast packets.
Automated import of CL 145920
2009-04-13 13:52:55 -07:00
Jeffrey Sharkey
d5a9af45ff Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:56:31 -07:00
Jeffrey Sharkey
7eb4fbdbb6 AI 145860: am: CL 145568 Hide setStarted() from public API.
It should be renamed to something more meaninful before being exposed.
  Original author: jsharkey
  Merged from: //branches/cupcake/...

Automated import of CL 145860
2009-04-13 08:55:24 -07:00
Dianne Hackborn
1710799c47 Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:53:57 -07:00
Dianne Hackborn
06f36b401d AI 145859: am: CL 145561 Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive).
Original author: hackbod
  Merged from: //branches/cupcake/...

Automated import of CL 145859
2009-04-13 08:52:45 -07:00
Andy Stadler
5f05afeeb6 Merge branch 'readonly-p4-donut' into donut 2009-04-10 16:26:11 -07:00
Andy Stadler
f8a7ceaef2 AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
Christopher Tate
06ba55476e Integrate new power connnect/disconnect broadcasts
Two new broadcasts, Intent.ACTION_POWER_CONNECTED and
Intent.ACTION_POWER_CONNECTED, that are issued when the device is plugged
and unplugged from USB or AC power.  This pulls two changes from the
open-source Gerrit repo into the internal Donut codeline:

1241 fda6fae Added broadcasts for external power events.
9491 37f8ca1 Fix system service crash when booting while on battery power

The current.xml API description has also been updated to include the
new Intent fields; the new API was approved in the original OSS change.
2009-04-09 16:03:56 -07:00
Dave Bort
2faf6081f2 Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-09 15:30:38 -07:00
Dave Bort
fb83907291 Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-09 15:18:48 -07:00
Eric Fischer
2984f14244 Merge branch 'readonly-p4-donut' into donut 2009-04-09 14:33:58 -07:00
Eric Fischer
2dcaf4ee66 AI 145493: am: CL 145214 Update cupcake translations.
Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 145493
2009-04-09 14:32:41 -07:00
Romain Guy
50457c1fc2 Merge branch 'readonly-p4-donut' into donut 2009-04-08 14:23:53 -07:00
Romain Guy
939151f1eb AI 145188: Fixes #1580949. Compress text when marquee is enabled but the text is too big by only a few percent of the TextView's width.
BUG=1580949

Automated import of CL 145188
2009-04-08 14:22:40 -07:00
Android (Google) Code Review
7d1d778575 Merge change 38 into donut
* changes:
  Fix issue #1769910 (Track activity launch times)
2009-04-08 13:42:34 -07:00
Dianne Hackborn
6447ca30b8 Fix issue #1769910 (Track activity launch times)
The usage stats service now collects per-activity launch time stats.  There are a number of fixes and improvements to its statistics management and collection; it now operates its calendar in GMT and ensures that for checkin purposes it always reports one day and only one complete day to the checkin service.

Also change the checkin option from "-c" to "--checkin" since it is really a special thing.
2009-04-07 19:50:08 -07:00
Cynthia Wong
36f9b695a1 Merge branch 'readonly-p4-donut' into donut 2009-04-07 17:25:27 -07:00
Cynthia Wong
f62b80fa1b AI 144928: Make the uphill discarding ops functionality controllable via a Gservices flag
BUG=1725022

Automated import of CL 144928
2009-04-07 17:24:14 -07:00
Android (Google) Code Review
ed571ea7c6 Merge change 37 into donut
* changes:
  Preserve an Activity's setIntent() state across relaunches
2009-04-07 16:54:26 -07:00
Christopher Tate
b70f3dff01 Preserve an Activity's setIntent() state across relaunches
Previously any Intent designated by setIntent() would be lost when
the Activity was shut down and restarted due to orientation change.
Now the custom intent is preserved across the relaunch.

Bug: b/1743425
2009-04-07 16:07:59 -07:00
Eric Fischer
374c83f420 AI 144912: Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
  Import a bunch of revised translations.

Automated import of CL 144912
2009-04-07 13:55:05 -07:00
Wink Saville
d6c5d527d3 AI 144705: Teleca patch from 03/27/2009, fixes some CDMA issues.
Automated import of CL 144705
2009-04-06 15:20:45 -07:00