Adrian Roos e3b07451c3 resolved conflicts for merge of bcc26c02 to master ...

Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388

2015-08-21 18:08:58 -07:00

..

admin

Merge "Update setApplicationRestrictions documentation" into mnc-dev

2015-08-11 09:40:57 +00:00

assist

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

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

backup

Correctly skip files that are excluded from restore

2015-08-06 10:28:08 -07:00

job

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

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

Adding API to access / change the task bounds

2015-08-13 08:31:43 -07:00

ActivityGroup.java

…

ActivityManager.aidl

…

ActivityManager.java

Merge "Restore recent task to freeform space when resizing"

2015-08-18 23:55:07 +00:00

ActivityManagerInternal.java

Disable multi-user background recording

2015-05-08 17:17:16 -07:00

ActivityManagerNative.java

Added support for docked stack

2015-08-18 11:31:20 -07:00

ActivityOptions.java

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

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

ActivityThread.java

Rebase system theme on configuration change

2015-08-11 17:27:04 -04:00

ActivityTransitionCoordinator.java

Fix input pause without resume.

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

ActivityTransitionState.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

ActivityView.java

am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev

2015-06-05 02:18:35 +00:00

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

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

Application.java

Annotate Application with @CallSuper

2015-05-06 09:44:53 -07:00

ApplicationErrorReport.java

[ActivityManager] Avoid NullPointerException if no

2015-04-08 18:04:11 +08:00

ApplicationLoaders.java

…

ApplicationPackageManager.java

Override package storage constraint

2015-08-10 09:50:48 -07:00

ApplicationThreadNative.java

resolved conflicts for merge of 8fb82074 to master

2015-06-24 17:28:01 -07:00

AppOpsManager.aidl

…

AppOpsManager.java

Merge "Add per UID control to app ops." into mnc-dev

2015-08-01 02:28:02 +00:00

BackStackRecord.java

Null checks to prevent NPEs in Fragments transactions.

2015-07-21 14:30:24 -07:00

BroadcastOptions.java

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

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

ContextImpl.java

Fix issue #21626564: MMS should be receivied while Dozing

2015-07-14 18:33:08 -07:00

DatePickerDialog.java

Force-commit changes on accept in spinner-style DatePickerDialog

2015-01-13 17:34:17 -08:00

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

Improve documentation of onRequestPermissionsResult

2015-07-16 16:29:04 -07:00

FragmentBreadCrumbs.java

Fix bug #17521147 Settings activity looks terrible on Volantis

2014-09-26 13:38:12 -07:00

FragmentContainer.java

Remove dependency upon FragmentActivity

2015-04-30 12:52:32 -07:00

FragmentController.java

Remove dependency upon FragmentActivity

2015-04-30 12:52:32 -07:00

FragmentHostCallback.java

Use who when requesting permissions

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

FragmentManager.java

Set a HW layer for Fragment alpha animation

2015-05-22 16:45:02 -07:00

FragmentTransaction.java

Remove hidden/deleted APIs.

2015-05-14 14:12:16 -07:00

IActivityContainer.aidl

am 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

2015-03-03 22:25:13 +00:00

IActivityContainerCallback.aidl

…

IActivityController.aidl

…

IActivityManager.java

Adding API to access / change the task bounds

2015-08-13 08:31:43 -07:00

IActivityPendingResult.aidl

…

IAlarmManager.aidl

Work on issue #20401752: device idle and alarms.

2015-04-21 16:59:12 -07:00

IApplicationThread.java

resolved conflicts for merge of 8fb82074 to master

2015-06-24 17:28:01 -07:00

IAppTask.aidl

…

IBackupAgent.aidl

Add payload-size preflight stage to full transport backup

2015-03-26 18:57:36 -07:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

Zen: New user flow for requesting DND access.

2015-06-08 11:53:35 -04:00

Instrumentation.java

Handle activity launch for background users

2015-08-13 11:29:51 -07:00

IntentService.java

Annotate some APIs with threading annotations

2015-04-23 22:14:19 +00:00

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

Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)

2014-12-02 15:34:20 -08:00

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

Add GTS test to ensure valid default permission grants - framework

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

IUidObserver.aidl

Update power manager to track uid state like netstats.

2015-05-18 18:13:41 -07:00

IUiModeManager.aidl

…

IUserSwitchObserver.aidl

Add foreground profile changed to user switch observer.

2015-04-13 18:03:05 +00:00

IWallpaperManager.aidl

Block setting wallpapers from managed profiles.

2015-03-09 10:39:21 +00:00

IWallpaperManagerCallback.aidl

…

JobSchedulerImpl.java

…

KeyguardManager.java

Clarify javadoc of isKeyguardSecure and isDeviceSecure

2015-04-29 14:02:55 -07:00

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

Add path to native libraries inside apk

2015-06-11 10:48:22 -07:00

LoaderManager.java

Remove dependency upon FragmentActivity

2015-04-30 12:52:32 -07:00

LocalActivityManager.java

Add Activity API to get referrer information.

2014-11-11 00:42:18 +00:00

MediaRouteActionProvider.java

…

MediaRouteButton.java

MediaRouter: make MediaRouteButton inherit Widget.Material.ActionButton

2015-08-07 18:29:23 +00:00

NativeActivity.java

…

Notification.aidl

…

Notification.java

Fix doc typo for default wearable notification size.

2015-08-04 11:59:45 -07:00

NotificationManager.aidl

Zen: Simplify notification policy api, add zenmode api.

2015-05-08 13:34:30 -04:00

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

Use DisplayAdjustments when creating display in ResourceManager

2015-06-06 11:26:33 -07:00

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

Add @ResourceInt annotations on APIs

2015-02-18 07:49:03 -08:00

SearchDialog.java

Allow Floating ActionModes in SearchDialog.

2015-05-01 15:38:01 +01:00

SearchManager.java

Fix assist for hardware long-press

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

Service.java

Mark Service#onBind() @Nullable

2015-02-19 15:31:11 -08:00

SharedElementCallback.java

Merge "Improve javadoc on SharedElementCallback."

2015-04-13 16:53:43 +00:00

SharedPreferencesImpl.java

Add some @Nullable annotations to SharedPreferences

2015-01-30 15:37:45 -08:00

StatusBarManager.java

Add status bar flag to disable quick settings

2015-04-28 18:49:47 +01:00

SystemServiceRegistry.java

Stop supporting legacy ConnectivityManager routing methods in M.

2015-07-31 11:08:27 +09:00

TabActivity.java

…

TaskStackBuilder.java

…

TimePickerDialog.java

Implement landscape layout for time picker dialog

2015-02-26 09:47:10 -08:00

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

Add support for user-selectable night mode

2015-02-12 11:01:06 -08:00

VoiceInteractor.aidl

Allow different visual and voice assist prompts

2015-06-05 16:36:22 -07:00

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

Block setting wallpapers from managed profiles.

2015-03-09 10:39:21 +00:00