Narayan Kamath a981e3b01a resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp ...

Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316

2014-04-09 14:57:59 +01:00

..

admin

Fix privilege escalation for preferred activities

2014-03-28 15:09:49 +00:00

backup

Rejigger the invalid-key checks at backup time

2014-04-01 16:43:00 -07:00

maintenance

…

trust

Define trust agent framework components

2014-03-31 21:18:28 +02:00

ActionBar.java

Fix ActionBar attribute parsing

2014-04-04 12:23:42 -07:00

Activity.java

Implement "Back" for Activity Transitions.

2014-04-07 09:00:13 -07:00

ActivityGroup.java

…

ActivityManager.java

Merge "Implement setActivityLabelAndIcon()."

2014-04-03 20:37:29 +00:00

ActivityManagerInternal.java

Move certain internal activity manager methods to new class.

2014-04-08 20:51:07 -07:00

ActivityManagerNative.java

resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

2014-04-09 14:57:59 +01:00

ActivityOptions.java

Add Transitions useful for Activity transitions.

2014-04-07 09:14:09 -07:00

ActivityThread.java

Shared library resource support

2014-03-25 12:09:56 -07:00

ActivityView.java

…

AlarmManager.java

…

AlertDialog.java

…

AliasActivity.java

…

AppGlobals.java

…

Application.java

…

ApplicationErrorReport.java

…

ApplicationLoaders.java

…

ApplicationPackageManager.java

Expand install observer semantics

2014-03-27 12:37:47 -07:00

ApplicationThreadNative.java

Inform libcore of time format pref. changes.

2014-03-07 13:55:23 +00:00

AppOpsManager.aidl

…

AppOpsManager.java

Add stream-level suppression to vibrate/audio services.

2014-03-19 15:32:51 -04:00

BackStackRecord.java

…

ContextImpl.java

Merge "Launcher APIs and broadcasts for managed profiles"

2014-04-08 22:04:20 +00:00

DatePickerDialog.java

…

Dialog.java

android.widget.Toolbar

2014-04-04 10:08:17 -07:00

DialogFragment.java

…

DownloadManager.java

…

ExpandableListActivity.java

…

Fragment.java

…

FragmentBreadCrumbs.java

…

FragmentManager.java

…

FragmentTransaction.java

…

IActivityContainer.aidl

…

IActivityContainerCallback.aidl

…

IActivityController.aidl

…

IActivityManager.java

resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

2014-04-09 14:57:59 +01:00

IActivityPendingResult.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

Inform libcore of time format pref. changes.

2014-03-07 13:55:23 +00:00

IBackupAgent.aidl

Rejigger the invalid-key checks at backup time

2014-04-01 16:43:00 -07:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

DO NOT MERGE Enhance the NotificationListenerService api.

2014-03-28 10:19:00 -04:00

Instrumentation.java

…

IntentService.java

…

IProcessObserver.aidl

…

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStopUserCallback.aidl

…

IThumbnailReceiver.aidl

…

IThumbnailRetriever.aidl

…

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

…

IUiModeManager.aidl

…

IUserSwitchObserver.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

…

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

Shared library resource support

2014-03-25 12:09:56 -07:00

LoaderManager.java

…

LocalActivityManager.java

…

MediaRouteActionProvider.java

…

MediaRouteButton.java

…

NativeActivity.java

…

Notification.aidl

…

Notification.java

Move legacy notification processing to Notification.Builder

2014-03-27 12:08:55 +01:00

NotificationManager.java

…

OnActivityPausedListener.java

…

package.html

…

PackageInstallObserver.java

Expand install observer semantics

2014-03-27 12:37:47 -07:00

PendingIntent.aidl

…

PendingIntent.java

am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.

2014-04-01 01:25:41 +00:00

Presentation.java

…

ProgressDialog.java

…

QueuedWork.java

…

ResourcesManager.java

Shared library resource support

2014-03-25 12:09:56 -07:00

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

…

SearchManager.java

…

Service.java

…

SharedPreferencesImpl.java

…

StatusBarManager.java

…

TabActivity.java

…

TaskStackBuilder.java

…

TimePickerDialog.java

…

UiAutomation.java

Added accessibility APIs for introspecting interactive windows.

2014-03-20 16:52:59 +00:00

UiAutomationConnection.java

…

UiModeManager.java

Introduce new UI_MODE_TYPE_WATCH and qualifier.

2014-04-04 15:21:53 -04:00

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

Change wallpaper sizing

2014-03-21 10:29:27 +00:00