491 Commits

Author SHA1 Message Date
Jack Palevich
e909ae55e3 Add clarifying comment.
(Primarily as a test of the master_gl branch.)
2009-04-13 22:03:39 -07:00
Jack Palevich
e88531ce4b Merge commit 'goog/master' into HEAD 2009-04-13 19:52:45 -07:00
Jeffrey Sharkey
269ba974fb Merge branch 'readonly-p4-master' 2009-04-13 16:58:42 -07:00
Jeffrey Sharkey
3ff7eb92ad AI 146012: am: CL 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/...
  Original author: android-build

Automated import of CL 146012
2009-04-13 16:57:28 -07:00
Dianne Hackborn
81ddb7929f Merge branch 'readonly-p4-master' 2009-04-13 16:55:10 -07:00
Dianne Hackborn
b3cddae499 AI 146011: am: CL 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/...
  Original author: android-build

Automated import of CL 146011
2009-04-13 16:54:00 -07:00
Dirk Dougherty
7c3633fd05 Merge branch 'readonly-p4-master' 2009-04-13 16:52:33 -07:00
Dirk Dougherty
4e44b76fdf AI 146010: am: CL 145858 am: CL 145559 Cleanup for early-look SDK.
Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146010
2009-04-13 16:51:21 -07:00
Dianne Hackborn
75534fbe24 Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4 AI 145994: Integrate #145778 from Donut.
Automated import of CL 145994
2009-04-13 16:11:55 -07:00
Mathias Agopian
77307ab848 Merge commit 'goog/master' into master_gl 2009-04-13 14:31:08 -07:00
Grace Kloba
0f87ca2037 Merge branch 'readonly-p4-master' 2009-04-13 14:05:40 -07:00
Grace Kloba
b3230cb1e3 AI 145922: Fix #1640053, #1777704. When WebKit set scroll position through jni, we need to check whether there is a pending draw as the scroll position should be based on the new picture, not the current picture.
BUG=1640053,1777704

Automated import of CL 145922
2009-04-13 14:04:23 -07:00
Patrick Scott
9536d0b413 Merge branch 'readonly-p4-master' 2009-04-13 09:59:09 -07:00
Patrick Scott
3156bb00dd AI 145870: Add a build property for the default alarm alert. Update the various
framework classes to deal with the new property. Also update various
  documentation that mentions the default ringtones.
  Use the build property as the default alert when the user has not chosen
  an alert for an alarm. This is also used if the alarm alert is null when
  the alarm fires.
  BUG=1723684

Automated import of CL 145870
2009-04-13 09:57:38 -07:00
Mathias Agopian
af9a515299 more debugging tools around BufferMapper 2009-04-10 20:34:46 -07:00
Mathias Agopian
7e25da07af fix KeyedVector::replaceValueAt, which wouldn't even compile if used. 2009-04-10 20:27:25 -07:00
Feng Qian
3d4122c5a2 Merge branch 'readonly-p4-master' 2009-04-10 18:12:55 -07:00
Feng Qian
9ae010a349 AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
2009-04-10 18:11:32 -07:00
Ficus Kirkpatrick
ed740498ca Add method on EncodedStringValue to transform a String[]. 2009-04-10 15:50:01 -07:00
Mathias Agopian
0179ff6594 Merge commit 'goog/master' into master_gl
Conflicts:
	libs/utils/Parcel.cpp
2009-04-10 14:36:33 -07:00
Mathias Agopian
1473f46cbc Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:30 -07:00
Jack Palevich
a8e947f604 Merge branch 'readonly-p4-master' 2009-04-09 19:54:37 -07:00
Jack Palevich
71d83c0489 AI 145639: am: CL 145602 am: CL 145255 Further work on correcting the misspelling of RENDERMODE_CONTUOUSLY
--> RENDERMODE_CONTINUOUSLY. This time we update the spelling
  in the list of APIs in SDK release 3. (Which hasn't actually been
  released yet, so it's OK to do this.)
  Original author: jackpal
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145639
2009-04-09 19:53:26 -07:00
Jack Palevich
3b9ff27e73 Merge branch 'readonly-p4-master' 2009-04-09 19:41:44 -07:00
Jack Palevich
f079c6852f AI 145633: Manually integrate the RENDER_CONTINUOUSLY change from
the donut branch.
  BUG=1766678

Automated import of CL 145633
2009-04-09 19:40:24 -07:00
Fred Quintana
546f75c5c5 Merge branch 'readonly-p4-master' 2009-04-09 15:07:04 -07:00
Fred Quintana
26fc5eba50 AI 145535: reenable the signin notifications
the system process has permissions to control this
  notification but the caller doesn't do we need to call
  clearCallerIdentity() before manipulating the notification
  BUG=1778648

Automated import of CL 145535
2009-04-09 15:05:50 -07:00
Jack Palevich
8ecf3b8763 Merge branch 'readonly-p4-master' 2009-04-09 15:04:22 -07:00
Jack Palevich
3e832dbe96 AI 145534: am: CL 145526 am: CL 145249 Correct misspelling of constant RENDERMODE_CONTUOUSLY --> RENDERMODE_CONTINUOUSLY
Original author: jackpal
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145534
2009-04-09 15:03:04 -07:00
Jack Palevich
9f4d38d396 Merge branch 'readonly-p4-master' 2009-04-09 14:55:24 -07:00
Jack Palevich
b47c641fe8 AI 145531: am: CL 145523 am: CL 145244 Fully document GLSurfaceView and related classes.
Original author: jackpal
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145531
2009-04-09 14:54:12 -07:00
Eric Fischer
af64013eca Merge branch 'readonly-p4-master' 2009-04-09 14:33:10 -07:00
Eric Fischer
580b13017e AI 145500: am: CL 145493 am: CL 145214 Update cupcake translations.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145500
2009-04-09 14:31:52 -07:00
Nick Pelly
3267062d9c Merge branch 'readonly-p4-master' 2009-04-08 19:24:05 -07:00
Nick Pelly
babf19136c AI 145203: am: CL 145201 Hold wakelock while delaying for audio route switch after headset unplug.
Fixes bug where we go to sleep before switching audio, and we lose audio until the apps CPU wakes up again.
  Original author: npelly

Automated import of CL 145203
2009-04-08 19:22:53 -07:00
Romain Guy
12abafd643 Merge branch 'readonly-p4-master' 2009-04-08 19:21:21 -07:00
Romain Guy
5b13cb6486 AI 145189: am: CL 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.
Original author: romainguy

Automated import of CL 145189
2009-04-08 19:20:13 -07:00
Fred Quintana
0c9c41255e Merge branch 'readonly-p4-master' 2009-04-08 19:16:09 -07:00
Fred Quintana
a698f42769 AI 145177: phase two of the AccountManager
- added an AccountManagerActivity, a base Activity that can be
  used by activities that are launched by AccountAuthenticator
  intents. This makes it easy for an Activity to send a result
  using an AccountAuthenticatorResponse
  - added debug strings to the AccountAuthenticatorCache
  - improved the API for the AccountAuthenticatorResponse and
  made it Parcelable so that it can be passed to an Activity
  via an Intent
  - changed the AccountManager to use Futures for the
  asynchronous calls and to notify the user via a callback
  when the request is complete
  - changed the AccountManager to convert any errors that are
  returned into Exceptions
  - added constants for the error codes that are passed across
  the IAccountManagerResponse and
  IAccountAuthenticatorResponse interfaces
  - added a dump() method to the AccountManagerService so that
  it can display the list of active sessions and registered
  authenticators
  - added an way to interrogate the AccountManagerService for
  the list of registered authenticators
  - removed more methods from the GoogleLoginServiceHelper and
  GoogleLoginServiceBlockingHelper and changed the callers to
  use the AccountManager

Automated import of CL 145177
2009-04-08 19:14:54 -07:00
Android (Google) Code Review
50fa392405 Merge change 54
* changes:
  Revert "Enable OpenCORE on master - part 1"
2009-04-08 17:02:55 -07:00
Android (Google) Code Review
ee5ecbdc38 Merge change 53
* changes:
  Revert "Changes required to accommodate OpenCORE 2.0"
2009-04-08 16:59:58 -07:00
Jean-Baptiste Queru
b98803b9eb Revert "Enable OpenCORE on master - part 1"
This reverts commit 9f1455fcc2ca8ad5e33b32b8a55c231944f4ff99.
2009-04-08 14:40:56 -07:00
Jean-Baptiste Queru
bb038d1604 Revert "Changes required to accommodate OpenCORE 2.0"
This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208.

Conflicts:

	media/libmediaplayerservice/Android.mk
2009-04-08 14:40:48 -07:00
Cynthia Wong
5167f9e28b Merge branch 'readonly-p4-master' 2009-04-08 13:33:32 -07:00
Cynthia Wong
44e4aaf133 AI 145124: am: CL 144928 Make the uphill discarding ops functionality controllable via a Gservices flag
Original author: cynthiaw

Automated import of CL 145124
2009-04-08 13:32:09 -07:00
Fred Quintana
ae267f9d45 Merge branch 'readonly-p4-master' 2009-04-08 00:39:52 -07:00
Fred Quintana
89ce244770 AI 144949: remove Maps
Automated import of CL 144949
2009-04-08 00:38:40 -07:00
Andy McFadden
5bbf237689 Merge branch 'readonly-p4-master' 2009-04-08 00:37:08 -07:00
Andy McFadden
599c918d97 AI 144931: Added a (hidden) way to "pre-cache" register maps.
The 50 methods that appeared on the GC stacks of the most applications
  require 13KB of native heap for their uncompressed register maps, and
  the full set took 5ms to uncompress.  Pre-computation doesn't represent
  a significant improvement in space or time, at the cost of a big pile
  of strings in ZygoteInit.
  I'm leaving the method in ZygoteInit, but it's not called, and the
  static final String[] of method descriptors is empty.  We may want to
  revisit this later.
  BUG=1729570

Automated import of CL 144931
2009-04-08 00:35:56 -07:00