289 Commits

Author SHA1 Message Date
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
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
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
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
Jack Palevich
69cbb96c88 Merge branch 'readonly-p4-donut' into donut 2009-04-09 18:47:55 -07:00
Jack Palevich
1eb75a0b37 AI 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/...

Automated import of CL 145602
2009-04-09 18:46:38 -07:00
Jack Palevich
f391664cd2 Merge branch 'readonly-p4-donut' into donut 2009-04-09 18:04:34 -07:00
Jack Palevich
32925df920 AI 145590: Manually merge change 145250 from cupcake.
Update API for GLSurfaceView to account for correcting the spelling of a
  constant RENDER_CONTINUOUSLY. (This constant is new to Cupcake, so this is not
  a breaking API change.)
  BUG=1766678

Automated import of CL 145590
2009-04-09 18:03:18 -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
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
The Android Open Source Project
d3af727927 Merge branch 'readonly-p4-master'
Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java
2009-04-02 12:18:20 -07:00
Wink Saville
04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
Romain Guy
aaf25b5a66 Merge branch 'readonly-p4-master' 2009-04-02 09:20:36 -07:00
Romain Guy
7fb60b9b4e AI 144080: No need to merge. Fix the build.
Automated import of CL 144080
2009-04-02 09:19:22 -07:00
Jean-Baptiste Queru
17b709c90f Merge branch 'readonly-p4-master' 2009-04-02 08:59:23 -07:00
Jean-Baptiste Queru
c7cdd292c4 AI 144009: am: CL 144007 am: CL 144006 Set a real 3.xml, which is the current candidate cupcake API.
This allows work done in later codelines to have proper
  backward-compatibility checks.
  Original author: jbq
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144009
2009-04-02 08:58:10 -07:00
Wink Saville
767a662ecd AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
Romain Guy
ad28bed52c AI 144042: Fixes #1742109. Add a new API to ListView to return the list of checked items ids.
BUG=1742109

Automated import of CL 144042
2009-04-01 11:46:43 -07:00
Jean-Baptiste Queru
43f503fd1e AI 144007: am: CL 144006 Set a real 3.xml, which is the current candidate cupcake API.
This allows work done in later codelines to have proper
  backward-compatibility checks.
  Original author: jbq
  Merged from: //branches/cupcake/...

Automated import of CL 144007
2009-04-01 10:23:58 -07:00
The Android Open Source Project
762d30a313 Merge branch 'open_source' into google_internal
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
2009-03-29 08:55:27 -07:00
Jean-Baptiste Queru
bf62297bd1 AI 143296: Merge from donut Change 143147
Automated import of CL 143296
2009-03-27 17:43:53 -07:00
Ed Heyl
a2debb356d AI 143278: Merge 142826: Add tutorial to platform. The tutorial can be launched with the new Intent ACTION_SYSTEM_TUTORIAL and
is available through Settings->About->System Tutorial

Automated import of CL 143278
2009-03-27 16:52:45 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
Dianne Hackborn
88fb1069bf AI 143147: Manual integration
Automated import of CL 143147
2009-03-27 14:59:22 -07:00
Amith Yamasani
a565e5e3d0 Automated import from //branches/master/...@142936,142936 2009-03-26 10:19:09 -07:00
Dianne Hackborn
73fbd70263 Automated import from //branches/cupcake/...@142829,142829 2009-03-25 18:37:33 -07:00
Jim Miller
303736d17d Automated import from //branches/donutburger/...@142826,142826 2009-03-25 18:18:34 -07:00
Jim Miller
7e4ad35590 Automated import from //branches/cupcake/...@142825,142825 2009-03-25 18:16:41 -07:00
Amith Yamasani
f0138614ac Automated import from //branches/donutburger/...@142787,142787 2009-03-25 17:39:37 -07:00
Amith Yamasani
2d548b56cd Automated import from //branches/cupcake/...@142786,142786 2009-03-25 16:26:35 -07:00
Jack Palevich
a605a51e63 Automated import from //branches/master/...@142658,142658 2009-03-25 15:16:50 -07:00
Dianne Hackborn
15ba27802e Automated import from //branches/master/...@142576,142576 2009-03-25 15:09:04 -07:00
Jean-Baptiste Queru
8b0662878e Automated import from //branches/master/...@142574,142574 2009-03-25 15:05:51 -07:00
Jack Palevich
c2310f32b0 Automated import from //branches/donutburger/...@142486,142486 2009-03-24 22:49:06 -07:00
Fred Quintana
603073430b Automated import from //branches/master/...@142414,142414 2009-03-24 22:48:12 -07:00
Dianne Hackborn
7d1e577d5f Automated import from //branches/donutburger/...@142472,142472 2009-03-24 22:47:09 -07:00
Romain Guy
97d00b3150 Automated import from //branches/donutburger/...@142465,142465 2009-03-24 22:45:53 -07:00
Jack Palevich
50fd2b9ef2 Automated import from //branches/cupcake/...@142485,142485 2009-03-24 20:22:54 -07:00
Niko Catania
4a0029f95d Automated import from //branches/donutburger/...@141213,141213 2009-03-24 19:51:09 -07:00
Niko Catania
a06f6e328d Automated import from //branches/master/...@141214,141214 2009-03-24 19:50:50 -07:00
Dianne Hackborn
ca783b947a Automated import from //branches/cupcake/...@142471,142471 2009-03-24 19:47:09 -07:00
Jeff Hamilton
e5a1a260c6 Automated import from //branches/donutburger/...@141106,141106 2009-03-24 19:32:51 -07:00
Jeff Hamilton
2c6b3b0c26 Automated import from //branches/master/...@141107,141107 2009-03-24 19:32:26 -07:00
Dianne Hackborn
1bf5e22da7 Automated import from //branches/donutburger/...@141001,141001 2009-03-24 19:11:58 -07:00