Dirk Dougherty e61cad321d resolved conflicts for merge of 532679a5 to master ...

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b

2012-03-07 16:58:03 -08:00

..

admin

docs: Add developer guide cross-references, Project ACRE, round 4

2011-12-22 15:08:23 -08:00

backup

Multi-user - wallpaper service

2012-02-10 14:34:07 -08:00

ActionBar.java

…

Activity.java

…

ActivityGroup.java

…

ActivityManager.java

Work on more low memory reporting to apps.

2012-03-06 18:46:32 -08:00

ActivityManagerNative.java

Work on more low memory reporting to apps.

2012-03-06 18:46:32 -08:00

ActivityThread.java

Merge "Allow disk I/O while performing dump()."

2012-03-02 18:07:35 -08:00

AlarmManager.java

Explicitly specify 'milliseconds' as alarm manager's time unit.

2011-12-22 22:51:37 -05:00

AlertDialog.java

…

AliasActivity.java

…

AppGlobals.java

…

Application.java

…

ApplicationErrorReport.java

Doc change: String changes for Android Market

2012-03-05 22:02:35 -08:00

ApplicationLoaders.java

…

ApplicationPackageManager.java

New development permissions.

2012-02-23 16:39:15 -08:00

ApplicationThreadNative.java

Add plumbing for dumping database info using dumpsys.

2011-12-16 04:01:00 -08:00

BackStackRecord.java

…

ContextImpl.java

Add an API for deleting databases.

2012-03-01 19:56:53 -08:00

DatePickerDialog.java

NumberPicker incorrectly shown for the old theme.

2011-11-29 18:40:05 -08:00

Dialog.java

Bug 5513073 - IllegalArgumentException: View not attached to window

2011-11-01 18:50:39 -07:00

DialogFragment.java

…

DownloadManager.java

…

ExpandableListActivity.java

…

Fragment.java

DO NOT MERGE

2012-02-28 13:47:15 -08:00

FragmentBreadCrumbs.java

…

FragmentManager.java

SDK only: now that support lib is in SDK, we can link to it.

2011-12-12 15:39:50 -08:00

FragmentTransaction.java

…

IActivityController.aidl

…

IActivityManager.java

Work on more low memory reporting to apps.

2012-03-06 18:46:32 -08:00

IActivityPendingResult.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

Add plumbing for dumping database info using dumpsys.

2011-12-16 04:01:00 -08:00

IBackupAgent.aidl

…

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

New notification priority and related APIs.

2012-02-24 13:47:00 -05:00

Instrumentation.java

Added missing comments in Instrumentation#sendStringSync

2011-11-11 16:50:25 -08:00

IntentService.java

…

IProcessObserver.aidl

…

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IThumbnailReceiver.aidl

…

IThumbnailRetriever.aidl

…

ITransientNotification.aidl

…

IUiModeManager.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

…

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

Report leaked Context registrations to StrictMode.

2012-03-01 21:10:05 -08:00

LoaderManager.java

Support automatic cancellation of Loaders.

2012-02-01 16:30:14 -08:00

LocalActivityManager.java

…

NativeActivity.java

…

Notification.aidl

…

Notification.java

New notification priority and related APIs.

2012-02-24 13:47:00 -05:00

NotificationManager.java

…

OnActivityPausedListener.java

…

package.html

…

PendingIntent.aidl

…

PendingIntent.java

…

ProgressDialog.java

…

QueuedWork.java

…

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

Removed intent logging from SearchDialog.java

2012-01-24 13:52:11 -08:00

SearchManager.java

docs: Add developer guide cross-references, Project ACRE, round 4

2011-12-22 15:08:23 -08:00

Service.java

…

SharedPreferencesImpl.java

…

StatusBarManager.java

System bar now renders the back button for recents

2011-12-06 17:22:19 -08:00

TabActivity.java

…

TimePickerDialog.java

NumberPicker incorrectly shown for the old theme.

2011-11-29 18:40:05 -08:00

UiModeManager.java

Add a new ui mode for "appliance"

2011-12-15 16:16:14 -08:00

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

Merge "Multi-user - wallpaper service"

2012-02-10 14:34:52 -08:00