Jorim Jaggi fc832e3ef2 resolved conflicts for c594e935 to master ...

Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0

2015-09-25 11:54:05 -07:00

..

admin

Cleanup USER_OWNER in DPMS

2015-09-23 18:49:00 +00:00

assist

Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties

2015-07-31 13:10:55 -07:00

backup

Merge "[Backup] Special handling for sharedpref files in backup config"

2015-08-25 18:06:15 +00:00

job

…

trust

Add StrongAuthTracker

2015-08-21 13:28:00 -07:00

usage

Remove uids with empty history from NetworkStats uid enumeration

2015-08-14 16:21:52 +01:00

ActionBar.java

Let the ActionBar handle keyboard shortcuts.

2015-07-15 10:44:43 -07:00

Activity.java

Preserve window during resize triggered relaunches.

2015-09-14 15:59:32 -07:00

ActivityGroup.java

…

ActivityManager.aidl

…

ActivityManager.java

Change resizeTask's parameter resizedByUser to constants

2015-09-22 00:46:02 +00:00

ActivityManagerInternal.java

…

ActivityManagerNative.java

Added am command to suppress config. changes during task resize.

2015-09-24 15:54:08 -07:00

ActivityOptions.java

Allow apps to pass in launch bounds when moving/starting a task

2015-09-03 18:23:21 -07:00

ActivityThread.java

Preserve window during resize triggered relaunches.

2015-09-14 15:59:32 -07:00

ActivityTransitionCoordinator.java

Fix input pause without resume.

2015-07-14 10:03:06 -07:00

ActivityTransitionState.java

Ensure feature flags are set prior to checking Activity Transition.

2015-09-09 12:45:55 -07:00

ActivityView.java

…

AlarmManager.aidl

…

AlarmManager.java

am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev

2015-08-01 17:04:28 +00:00

AlertDialog.java

Don't re-wrap alert dialog context

2015-08-11 15:02:42 -04:00

AliasActivity.java

…

AppGlobals.java

…

AppImportanceMonitor.java

…

Application.java

…

ApplicationErrorReport.java

…

ApplicationLoaders.java

…

ApplicationPackageManager.java

Merge "Revert "Add more methods that take a userId to PackageManager.""

2015-09-23 11:35:50 +00:00

ApplicationThreadNative.java

Preserve window during resize triggered relaunches.

2015-09-14 15:59:32 -07:00

AppOpsManager.aidl

…

AppOpsManager.java

Add get_accounts app op

2015-09-09 07:31:17 -07:00

BackStackRecord.java

Ensure entering and exiting views don't match in Fragment Transitions.

2015-09-10 13:54:28 -07:00

BroadcastOptions.java

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

ContextImpl.java

Extract drawable inflation to its own class, inflate from class name

2015-08-27 13:16:09 -04:00

DatePickerDialog.java

…

Dialog.java

Support finishing a task with any finishing activity in the task.

2015-08-06 09:59:32 -07:00

DialogFragment.java

Method to show DialogFragment allowing state loss.

2015-08-13 16:57:29 -07:00

DownloadManager.java

Always return content Uri for downloads.

2015-07-29 10:22:30 -07:00

EnterTransitionCoordinator.java

Fix input pause without resume.

2015-07-14 10:03:06 -07:00

ExitTransitionCoordinator.java

Change MNC codename to just M.

2015-07-29 15:20:21 -07:00

ExpandableListActivity.java

…

Fragment.java

save "retain loader" state

2015-09-22 10:16:42 -07:00

FragmentBreadCrumbs.java

…

FragmentContainer.java

…

FragmentController.java

save "retain loader" state

2015-09-22 10:16:42 -07:00

FragmentHostCallback.java

Use who when requesting permissions

2015-06-09 18:17:44 -07:00

FragmentManager.java

save "retain loader" state

2015-09-22 10:16:42 -07:00

FragmentTransaction.java

…

IActivityContainer.aidl

…

IActivityContainerCallback.aidl

…

IActivityController.aidl

…

IActivityManager.java

Added am command to suppress config. changes during task resize.

2015-09-24 15:54:08 -07:00

IActivityPendingResult.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

Preserve window during resize triggered relaunches.

2015-09-14 15:59:32 -07:00

IAppTask.aidl

…

IBackupAgent.aidl

…

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

…

Instrumentation.java

Preserve window during resize triggered relaunches.

2015-09-14 15:59:32 -07:00

IntentService.java

…

IProcessObserver.aidl

…

ISearchManager.aidl

Fix assist for hardware long-press

2015-07-08 22:26:24 +00:00

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStopUserCallback.aidl

…

ITaskStackListener.aidl

…

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

Add GTS test to ensure valid default permission grants - framework

2015-08-12 21:57:59 -07:00

IUidObserver.aidl

…

IUiModeManager.aidl

…

IUserSwitchObserver.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

JobSchedulerImpl.java

…

KeyguardManager.java

…

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

Postpone loading app context until instrumentation is set up

2015-09-03 14:55:27 -04:00

LoaderManager.java

…

LocalActivityManager.java

…

MediaRouteActionProvider.java

…

MediaRouteButton.java

Invalidate when Drawable.setState() returns true

2015-09-04 10:10:42 -04:00

NativeActivity.java

…

Notification.aidl

…

Notification.java

Fixes cloned notification actions missing icon.

2015-09-10 13:13:45 -04:00

NotificationManager.aidl

…

NotificationManager.java

Patch up certain kinds of broken notifications.

2015-06-18 15:12:44 -04:00

OnActivityPausedListener.java

…

package.html

…

PackageDeleteObserver.java

…

PackageInstallObserver.java

…

PendingIntent.aidl

…

PendingIntent.java

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

Presentation.java

Support 4K overlay displays.

2015-06-09 19:52:23 -07:00

ProfilerInfo.java

…

ProgressDialog.java

…

QueuedWork.java

…

RemoteInput.java

…

ResourcesManager.java

Add missing @param in ResourceManager, set InflateException source

2015-08-31 11:36:16 -04:00

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

…

SearchManager.java

Fix assist for hardware long-press

2015-07-08 22:26:24 +00:00

Service.java

…

SharedElementCallback.java

…

SharedPreferencesImpl.java

…

StatusBarManager.java

Deliver camera launch source for analytics

2015-09-24 16:32:09 -07:00

SystemServiceRegistry.java

Make DPM/DPMS unit-testable

2015-09-22 12:47:44 -07:00

TabActivity.java

…

TaskStackBuilder.java

…

TimePickerDialog.java

…

UiAutomation.java

Add GTS test to ensure valid default permission grants - framework

2015-08-12 21:57:59 -07:00

UiAutomationConnection.java

Add GTS test to ensure valid default permission grants - framework

2015-08-12 21:57:59 -07:00

UiModeManager.java

…

VoiceInteractor.aidl

…

VoiceInteractor.java

Work on issue #21516866: Implement voice interaction in ResolverActivity

2015-07-28 12:52:11 -07:00

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

…