Tom Taylor f0108cda21 resolved conflicts for merge of ad2fa35d to master ...

Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90

2009-12-22 10:11:55 -08:00

..

Activity.java

Remove globalSearch argument from triggerSearch()

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

ActivityGroup.java

…

ActivityManager.java

DropBox logging of app & system server crashes.

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

ActivityManagerNative.java

DropBox logging of app & system server crashes.

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

ActivityThread.java

Unbundling work

2009-12-14 09:24:09 -08:00

AlarmManager.java

…

AlertDialog.java

…

AliasActivity.java

Update imports to android-common

2009-12-21 13:59:18 -08:00

Application.java

…

ApplicationContext.java

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

ApplicationErrorReport.java

DropBox logging of app & system server crashes.

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

ApplicationLoaders.java

…

ApplicationThreadNative.java

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

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

BackupAgent.java

Turn off most of the backup-related debug logging

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

DatePickerDialog.java

…

Dialog.java

…

ExpandableListActivity.java

…

FullBackupAgent.java

…

IActivityController.aidl

DropBox logging of app & system server crashes.

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

IActivityManager.java

DropBox logging of app & system server crashes.

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

IActivityPendingResult.aidl

…

IActivityWatcher.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

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

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

IBackupAgent.aidl

…

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

…

IntentService.java

…

ISearchManager.aidl

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

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

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStatusBar.aidl

…

IThumbnailReceiver.aidl

…

ITransientNotification.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

…

LauncherActivity.java

…

ListActivity.java

…

LocalActivityManager.java

…

Notification.aidl

…

Notification.java

…

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

…

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