drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,276 Commits 1 Branch 0 Tags
Commit Graph

2623 Commits

Author SHA1 Message Date
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
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
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
Dianne Hackborn
51bf077883 Automated import from //branches/master/...@141004,141004 2009-03-24 19:11:41 -07:00
Dianne Hackborn
73e5be19da Automated import from //branches/master/...@140926,140926 2009-03-24 18:57:03 -07:00
Dianne Hackborn
97f10fd56b Automated import from //branches/donutburger/...@140923,140923 2009-03-24 18:56:59 -07:00
Dianne Hackborn
f63220f58e Automated import from //branches/donutburger/...@140828,140828 2009-03-24 18:38:43 -07:00
Dianne Hackborn
04750b6b43 Automated import from //branches/master/...@140830,140830 2009-03-24 18:38:23 -07:00
Niko Catania
d01721d5ca Automated import from //branches/donutburger/...@140811,140811 2009-03-24 18:35:10 -07:00
Niko Catania
70322464af Automated import from //branches/master/...@140812,140812 2009-03-24 18:35:07 -07:00
Dianne Hackborn
1c9aefd471 Automated import from //branches/master/...@140719,140719 2009-03-24 18:18:28 -07:00
Dianne Hackborn
38e98fccfa Automated import from //branches/donutburger/...@140714,140714 2009-03-24 18:18:24 -07:00
Jean-Michel Trivi
a5e5643d5d Automated import from //branches/master/...@140567,140567 2009-03-24 17:57:26 -07:00
Jean-Michel Trivi
470f71f4a4 Automated import from //branches/donutburger/...@140566,140566 2009-03-24 17:55:14 -07:00
The Android Open Source Project
c2ad241504 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:54 -07:00
The Android Open Source Project
7b0b1ed979 auto import //branches/master/...@140412 2009-03-18 22:20:26 -07:00
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge 
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
 2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:22 -07:00