Adam Powell b9eab6c793 resolved conflicts for merge of 81cd2e90 to master ...

Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71

2010-04-23 16:49:54 -07:00

..

admin

Fix issue #2530103: ActivePassword data in Device Policy Manager needs to be persisted

2010-03-22 22:20:26 -07:00

backup

SDK: last of the backup/restore docs content

2010-04-12 18:24:05 -07:00

Activity.java

Introducing Fragment.

2010-04-19 15:09:31 -07:00

ActivityGroup.java

…

ActivityManager.java

Fix issue #2555171: Switching to app immediately after unmounting...

2010-04-13 17:35:22 -07:00

ActivityManagerNative.java

Add new activity manager method to get list of running applications installed on sdcard.

2010-03-23 16:56:08 -07:00

ActivityThread.java

Introducing Fragment.

2010-04-19 15:09:31 -07:00

AlarmManager.java

Add an AlarmManager API to set the system time (with the proper permissions).

2010-02-05 12:31:41 -08:00

AlertDialog.java

Fix bug 2523989

2010-03-18 13:44:45 -07:00

AliasActivity.java

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

Application.java

…

ApplicationErrorReport.java

Add BatteryInfo to ApplicationErrorReport.

2010-02-26 22:52:44 +01:00

ApplicationLoaders.java

…

ApplicationThreadNative.java

Fix issue #2304284: contacts/dialer/recentcalls constantly flashing

2009-12-11 15:24:33 -08:00

ContextImpl.java

resolved conflicts for merge of 81cd2e90 to master

2010-04-23 16:49:54 -07:00

DatePickerDialog.java

…

Dialog.java

Tame the monkey.

2010-03-29 13:00:07 -07:00

ExpandableListActivity.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

Fragment.java

Introducing Fragment.

2010-04-19 15:09:31 -07:00

FragmentManager.java

Introducing Fragment.

2010-04-19 15:09:31 -07:00

FragmentTransaction.java

Introducing Fragment.

2010-04-19 15:09:31 -07:00

FullBackupAgent.java

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

IActivityController.aidl

DropBox logging of app & system server crashes.

2009-12-21 16:03:19 -08:00

IActivityManager.java

Add new activity manager method to get list of running applications installed on sdcard.

2010-03-23 16:56:08 -07:00

IActivityPendingResult.aidl

…

IActivityWatcher.aidl

…

IAlarmManager.aidl

Add an AlarmManager API to set the system time (with the proper permissions).

2010-02-05 12:31:41 -08:00

IApplicationThread.java

Fix issue #2304284: contacts/dialer/recentcalls constantly flashing

2009-12-11 15:24:33 -08:00

IBackupAgent.aidl

Refactor android.backup => android.app.backup

2010-03-05 16:27:15 -08:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

add a optional String to the key of notifications to allow users

2009-09-25 16:01:22 -07:00

Instrumentation.java

Introducing Fragment.

2010-04-19 15:09:31 -07:00

IntentService.java

Fix SDK build.

2010-04-07 13:54:49 +08:00

ISearchManager.aidl

Clean up global search and web search activity finding

2010-02-23 14:27:43 +00:00

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStatusBar.aidl

…

IThumbnailReceiver.aidl

…

ITransientNotification.aidl

…

IUiModeManager.aidl

Fix issue #2581524: Car home icon should always go to car home

2010-04-09 16:49:08 -07:00

IWallpaperManager.aidl

Implement all of the infrastructure for configuring wallpapers.

2009-09-07 22:48:02 -07:00

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

…

LauncherActivity.java

Implement all of the infrastructure for configuring wallpapers.

2009-09-07 22:48:02 -07:00

ListActivity.java

ListActivity.onDestroy, remove any pending callbacks.

2010-03-12 15:37:43 -08:00

LocalActivityManager.java

…

Notification.aidl

…

Notification.java

Add DateTimeView, a widget that shows a time or the date depending on the

2010-01-19 16:32:22 -08:00

NotificationManager.java

add a optional String to the key of notifications to allow users

2009-09-25 16:01:22 -07:00

package.html

…

PendingIntent.aidl

…

PendingIntent.java

Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast

2009-10-05 15:52:32 -07:00

ProgressDialog.java

…

ResultInfo.java

…

SearchableInfo.aidl

Move android.server.search.SearchableInfo to android.app

2009-12-04 12:52:51 +00:00

SearchableInfo.java

Guard against NPE in SearchManagerService

2010-04-06 14:48:41 +01:00

SearchDialog.java

Show the microphone when the search box is opened from browser

2010-04-07 12:22:01 -04:00

SearchManager.java

docs: remove documenation about the search dialog from SearchManager

2010-03-17 15:03:05 -07:00

Service.java

A little more improvement of the Service javadoc.

2010-04-15 12:22:01 -07:00

StatusBarManager.java

Add support in StatusBarManager for disabling ticker text.

2010-02-04 15:55:00 -08:00

SuggestionsAdapter.java

For search suggestions in the search dialog, allow the 'title'

2010-04-15 11:35:47 -04:00

TabActivity.java

…

TimePickerDialog.java

…

UiModeManager.java

Fix issue #2581524: Car home icon should always go to car home

2010-04-09 16:49:08 -07:00

WallpaperInfo.aidl

Implement all of the infrastructure for configuring wallpapers.

2009-09-07 22:48:02 -07:00

WallpaperInfo.java

Fix some bugs.

2010-03-04 11:52:14 -08:00

WallpaperManager.java

Fix most of issue #2271640: Fix wallpaper etc docs

2009-11-18 18:34:19 -08:00