Dan Egnor d021302134 resolved conflicts for merge of f6bb01b0 to master

2009-12-11 14:55:24 -08:00

..

Activity.java

Remove globalSearch argument from triggerSearch()

2009-10-01 09:57:33 +01:00

ActivityGroup.java

…

ActivityManager.java

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

ActivityManagerNative.java

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

ActivityThread.java

Make sure to acknowledge stale broadcasts

2009-12-08 13:48:45 -08:00

AlarmManager.java

…

AlertDialog.java

…

AliasActivity.java

…

Application.java

…

ApplicationContext.java

Encrypted File Systems Project. Installer modifications.

2009-11-24 11:44:19 -08:00

ApplicationErrorReport.java

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

ApplicationLoaders.java

…

ApplicationThreadNative.java

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

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

BackupAgent.java

Turn off most of the backup-related debug logging

2009-09-30 17:07:37 -07:00

DatePickerDialog.java

donut snapshot

2009-07-21 11:16:54 -07:00

Dialog.java

Last big work on #1991910: Make swipes work with capacitive keys

2009-09-14 17:53:52 -07:00

ExpandableListActivity.java

…

FullBackupAgent.java

donut snapshot

2009-07-21 11:16:54 -07:00

IActivityController.aidl

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

IActivityManager.java

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

IActivityPendingResult.aidl

…

IActivityWatcher.aidl

donut snapshot

2009-07-31 17:38:20 -07:00

IAlarmManager.aidl

…

IApplicationThread.java

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

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

IBackupAgent.aidl

donut snapshot

2009-07-21 11:16:54 -07: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

Performance measurement framework:

2009-09-11 17:15:15 -07:00

IntentService.java

Add more control over a service's start state.

2009-08-24 17:00:54 -07:00

ISearchManager.aidl

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

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

ISearchManagerCallback.aidl

donut snapshot

2009-07-21 11:16:54 -07:00

IServiceConnection.aidl

…

IStatusBar.aidl

…

IThumbnailReceiver.aidl

…

ITransientNotification.aidl

…

IWallpaperManager.aidl

Implement all of the infrastructure for configuring wallpapers.

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

IWallpaperManagerCallback.aidl

First bit of wallpaper work.

2009-08-05 21:29:42 -07:00

KeyguardManager.java

…

LauncherActivity.java

Implement all of the infrastructure for configuring wallpapers.

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

ListActivity.java

Fix documentation example, per issue 895 on android.googlecode.com

2009-07-23 15:14:14 -07:00

LocalActivityManager.java

…

Notification.aidl

…

Notification.java

Fix issue #2047139: Remove Service.setForeground()

2009-08-18 13:59:27 -07: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

Expose SearchableInfo and getSearchablesInGlobalSearch()

2009-12-08 19:21:19 +00:00

SearchDialog.java

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

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

SearchManager.java

Use unbundled QSB for global search

2009-12-09 14:51:19 +00:00

Service.java

Update service example code.

2009-12-07 18:06:09 -08:00

StatusBarManager.java

…

SuggestionsAdapter.java

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

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

TabActivity.java

…

TimePickerDialog.java

…

WallpaperInfo.aidl

Implement all of the infrastructure for configuring wallpapers.

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

WallpaperInfo.java

Fix most of issue #2271640: Fix wallpaper etc docs

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

WallpaperManager.java

Fix most of issue #2271640: Fix wallpaper etc docs

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