Jeff Sharkey 116be95495 Merge commit '81eb7640' into mergeit ...

Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350

2012-09-12 16:34:31 -07:00

..

admin

Update DevicePolicyManager with ability to disable keyguard widgets

2012-09-04 13:52:36 -07:00

backup

Centralize the creation of the user system directory

2012-08-31 15:33:21 -07:00

ActionBar.java

Make ActionBar aware of layout direction

2012-07-12 17:39:12 -07:00

Activity.java

Nested fragments.

2012-09-06 11:05:53 -07:00

ActivityGroup.java

…

ActivityManager.java

Flesh out multi-user in am commands.

2012-09-10 14:52:30 -07:00

ActivityManagerNative.java

Flesh out multi-user in am commands.

2012-09-10 14:52:30 -07:00

ActivityOptions.java

Adding a thumbnail scale down animation

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

ActivityThread.java

Merge commit '81eb7640' into mergeit

2012-09-12 16:34:31 -07:00

AlarmManager.java

…

AlertDialog.java

Initial draft of high-level multi-display APIs.

2012-08-31 15:42:45 -07:00

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

More multi-user methods in PM

2012-09-08 19:14:00 -07:00

ApplicationThreadNative.java

Add registering for explicit users.

2012-09-04 10:39:21 -07:00

BackStackRecord.java

Fix issue #6584942 IllegalStateException: Failure saving state...

2012-06-05 10:52:38 -07:00

ContextImpl.java

Set up default (random) Android IDs for all users

2012-09-11 14:51:33 -07:00

DatePickerDialog.java

docs: fix a bunch of links from javadocs to api guides

2012-07-24 17:50:48 -07:00

Dialog.java

Initial draft of high-level multi-display APIs.

2012-08-31 15:42:45 -07:00

DialogFragment.java

docs: misc bugs from external tracker

2012-07-03 18:08:19 -07:00

DownloadManager.java

Adds missing Bluetooth as network type.

2012-07-10 15:03:54 +02:00

ExpandableListActivity.java

…

Fragment.java

A little cleanup.

2012-09-09 14:41:34 -07:00

FragmentBreadCrumbs.java

…

FragmentManager.java

A little cleanup.

2012-09-09 14:41:34 -07:00

FragmentTransaction.java

…

IActivityController.aidl

…

IActivityManager.java

Flesh out multi-user in am commands.

2012-09-10 14:52:30 -07:00

IActivityPendingResult.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

Add registering for explicit users.

2012-09-04 10:39:21 -07:00

IBackupAgent.aidl

…

IInstrumentationWatcher.aidl

Prevent binder flooding when sending instrumentation status.

2012-05-01 12:33:28 -07:00

INotificationManager.aidl

Remove Binder.getOrigCallingUid().

2012-08-31 15:11:13 -07:00

Instrumentation.java

Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action.

2012-08-23 13:59:40 -07:00

IntentService.java

…

IProcessObserver.aidl

Extend process observer to be usable for media routing.

2012-05-31 18:58:34 -07:00

ISearchManager.aidl

Launch ASSIST intent on the current user

2012-08-14 12:39:29 -07:00

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStopUserCallback.aidl

Start implementing concept of "running" users.

2012-08-28 16:30:55 -07:00

IThumbnailReceiver.aidl

…

IThumbnailRetriever.aidl

…

ITransientNotification.aidl

…

IUiModeManager.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

Refactor for multi-display support.

2012-08-19 22:42:08 -07:00

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

Add registering for explicit users.

2012-09-04 10:39:21 -07:00

LoaderManager.java

Nested fragments.

2012-09-06 11:05:53 -07:00

LocalActivityManager.java

…

MediaRouteActionProvider.java

Make MediaRouteButton focusable by default

2012-08-02 11:23:55 -07:00

MediaRouteButton.java

Make MediaRouteButton focusable by default

2012-08-02 11:23:55 -07:00

NativeActivity.java

Allow applications to recover from IME related ANRs.

2012-06-14 16:32:12 -07:00

Notification.aidl

…

Notification.java

docs: misc bug fixes from external issues

2012-08-13 19:12:13 -07:00

NotificationManager.java

Remove Binder.getOrigCallingUid().

2012-08-31 15:11:13 -07:00

OnActivityPausedListener.java

…

package.html

…

PendingIntent.aidl

…

PendingIntent.java

Add registering for explicit users.

2012-09-04 10:39:21 -07:00

Presentation.java

Initial draft of high-level multi-display APIs.

2012-08-31 15:42:45 -07:00

ProgressDialog.java

…

QueuedWork.java

…

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

…

SearchManager.java

Rename UserId to UserHandle.

2012-08-16 12:46:38 -07:00

Service.java

docs: fix broken links

2012-08-06 18:04:23 -07:00

SharedPreferencesImpl.java

Use Libcore's stat instead of FileUtils#getFileStatus

2012-08-16 15:27:55 -07:00

StatusBarManager.java

DO NOT MERGE

2012-03-12 15:16:29 -07:00

TabActivity.java

…

TaskStackBuilder.java

Be more tolerant in TaskStackBuilder

2012-05-16 16:23:03 -07:00

TimePickerDialog.java

docs: fix a bunch of links from javadocs to api guides

2012-07-24 17:50:48 -07:00

UiModeManager.java

…

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

Refactor for multi-display support.

2012-08-19 22:42:08 -07:00