Colin Cross 41bf778441 resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp ...

am: 4bf50e486f

* commit '4bf50e486f85d7a9630ded3e36216710c9d1f97d':
  Add dumpsys meminfo --unreachable

2016-02-19 06:32:06 +00:00

..

admin

Merge "Clean up App Standby code" into nyc-dev

2016-02-17 21:50:32 +00:00

assist

Make isAppProvidedWebUri false from setDefaultIntent()

2015-12-02 17:43:19 -07:00

backup

Make BackupManager encryption aware.

2016-02-18 10:54:11 -07:00

job

Implement transient extras for jobs.

2016-02-11 11:28:48 -08:00

trust

Fix broken checkbuild

2016-01-25 14:09:01 -08:00

usage

Implementation of data usage callbacks.

2016-02-17 18:43:53 -08:00

ActionBar.java

Fix ToolbarActionBar invalidating destroyed Activities

2016-01-04 20:52:23 +00:00

Activity.java

Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev am: 0f3431b616

2016-02-19 04:16:19 +00:00

ActivityGroup.java

…

ActivityManager.aidl

…

ActivityManager.java

Fix recents transitions

2016-02-17 06:17:48 +00:00

ActivityManagerInternal.java

Voice Interaction from within an Activity

2016-01-23 21:25:50 -08:00

ActivityManagerNative.java

Implement lenient background check option.

2016-02-18 13:42:52 -08:00

ActivityOptions.java

API council recommended changes to bounds APIs in ActivityOptions

2016-01-29 22:33:38 -08:00

ActivityThread.java

resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp

2016-02-18 22:27:04 -08:00

ActivityTransitionCoordinator.java

Don't use forceVisibility for Activity Transitions.

2016-02-10 22:12:14 +00:00

ActivityTransitionState.java

Fix for Activity Transitions restoring views bug.

2016-01-08 08:29:25 -08:00

ActivityView.java

ActivityView gets its own thread pool.

2015-11-11 18:21:57 -05:00

AlarmManager.aidl

…

AlarmManager.java

DO NOT MERGE Introduce direct listener API for alarm delivery

2015-12-10 16:06:50 -08: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

Use shared namespace for bundled app classloader

2015-12-20 14:12:45 -08:00

ApplicationPackageManager.java

Merge "[framework] Don't allow apps on external storage to be active admin" into nyc-dev

2016-02-17 22:48:13 +00:00

ApplicationThreadNative.java

resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp

2016-02-18 22:27:04 -08:00

AppOpsManager.aidl

…

AppOpsManager.java

Initial stab at background check.

2015-11-16 17:58:32 -08:00

AutomaticZenRule.aidl

Third party DND provider APIs.

2015-09-30 13:39:12 -04:00

AutomaticZenRule.java

Add id and creation date to Zen rules.

2015-10-05 20:32:29 -04:00

BackStackRecord.java

FragmentTransaction.commitNow, framework edition

2016-02-08 19:00:52 +00:00

BroadcastOptions.java

Add new target SDK filtering feature to BroadcastOptions.

2015-12-10 12:12:00 -08:00

ContextImpl.java

Make BackupManager encryption aware.

2016-02-18 10:54:11 -07:00

DatePickerDialog.java

Don't set date picker dialog title on date changed

2016-01-13 11:14:41 -05:00

Dialog.java

Request Keyboard Shortcuts for SysUI Dialog via Window

2016-01-13 16:56:56 +00:00

DialogFragment.java

Method to show DialogFragment allowing state loss.

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

DownloadManager.java

DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.

2016-02-16 19:27:32 +00:00

EnterTransitionCoordinator.java

Don't use forceVisibility for Activity Transitions.

2016-02-10 22:12:14 +00:00

ExitTransitionCoordinator.java

Don't use forceVisibility for Activity Transitions.

2016-02-10 22:12:14 +00:00

ExpandableListActivity.java

…

Fragment.java

Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev

2016-02-19 04:03:50 +00:00

FragmentBreadCrumbs.java

…

FragmentContainer.java

…

FragmentController.java

Permit setRetainInstance(true) on nested fragments, framework edition

2016-02-08 19:10:44 +00:00

FragmentHostCallback.java

Retain fragment loaders

2015-10-19 16:40:03 -07:00

FragmentManager.java

Permit setRetainInstance(true) on nested fragments, framework edition

2016-02-08 19:10:44 +00:00

FragmentManagerNonConfig.java

Permit setRetainInstance(true) on nested fragments, framework edition

2016-02-08 19:10:44 +00:00

FragmentTransaction.java

FragmentTransaction.commitNow, framework edition

2016-02-08 19:00:52 +00:00

IActivityContainer.aidl

…

IActivityContainerCallback.aidl

…

IActivityController.aidl

…

IActivityManager.java

Implement lenient background check option.

2016-02-18 13:42:52 -08:00

IActivityPendingResult.aidl

…

IAlarmCompleteListener.aidl

DO NOT MERGE Introduce direct listener API for alarm delivery

2015-12-10 16:06:50 -08:00

IAlarmListener.aidl

DO NOT MERGE Introduce direct listener API for alarm delivery

2015-12-10 16:06:50 -08:00

IAlarmManager.aidl

DO NOT MERGE Introduce direct listener API for alarm delivery

2015-12-10 16:06:50 -08:00

IApplicationThread.java

resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp

2016-02-18 22:27:04 -08:00

IAppTask.aidl

…

IBackupAgent.aidl

Quota exceeded API in BackupAgent

2016-01-22 14:38:52 +01:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

Show topic settings inline if user has configured topics.

2016-02-12 11:42:02 -05:00

Instrumentation.java

Clean up UiAutomation working alongside a11y.

2016-02-09 00:08:59 +00:00

IntentService.java

Improve documentation for IntentService

2016-01-21 15:07:01 +00:00

IProcessObserver.aidl

…

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IStopUserCallback.aidl

…

ITaskStackListener.aidl

Reduce jank during pinned stack animation

2016-02-09 12:48:11 -08:00

ITransientNotification.aidl

…

IUiAutomationConnection.aidl

Optionally support accessibility with UiAutomator

2016-01-28 10:09:05 -08:00

IUidObserver.aidl

Initial stab at background check.

2015-11-16 17:58:32 -08:00

IUiModeManager.aidl

allow locking UI mode and block launching car dock for automotive

2015-12-03 13:05:35 -08:00

IUserSwitchObserver.aidl

…

IWallpaperManager.aidl

Keyguard wallpaper

2016-02-18 15:01:02 -08:00

IWallpaperManagerCallback.aidl

…

JobSchedulerImpl.java

Adds sourcePackageName field to JobStatus

2016-01-15 22:46:28 +00:00

KeyguardManager.java

Make ConfirmCredentials take user into account when creating intent

2015-12-15 10:45:13 +00:00

LauncherActivity.java

…

ListActivity.java

…

ListFragment.java

…

LoadedApk.java

More encryption-aware triaging.

2016-02-09 15:56:13 -07: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

Merge "The NDK samples moved a while back."

2016-02-10 04:50:01 +00:00

Notification.aidl

Implement notification ranking by topic.

2015-11-20 14:25:07 -05:00

Notification.java

Inflate and strip remote views for pre-N apps.

2016-02-18 08:35:45 -05:00

NotificationManager.aidl

…

NotificationManager.java

Inflate and strip remote views for pre-N apps.

2016-02-18 08:35:45 -05:00

OnActivityPausedListener.java

…

package.html

…

PackageDeleteObserver.java

…

PackageInstallObserver.java

…

PendingIntent.aidl

…

PendingIntent.java

Exposing file:// beyond your app is bad, m'kay?

2016-01-28 19:20:12 -07:00

Presentation.java

…

ProfilerInfo.java

…

ProgressDialog.java

…

QueuedWork.java

…

RemoteInput.java

…

ResourcesManager.java

Move locale negotiation to ResourcesManager

2016-01-25 19:23:38 -08:00

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

More encryption-aware triaging.

2016-02-09 15:56:13 -07:00

SearchDialog.java

Use Context.getSystemService(Class<T>) for InputMethodManager.

2015-11-26 00:02:05 -08:00

SearchManager.java

…

Service.java

…

SharedElementCallback.java

…

SharedPreferencesImpl.java

Offer to migrate databases and SharedPreferences.

2016-01-30 17:03:23 -07:00

StatusBarManager.java

Support dnd condition in Settings

2015-12-13 16:22:37 -05:00

SynchronousUserSwitchObserver.java

Added SynchronousUserSwitchObserver

2015-12-02 16:40:11 -08:00

SystemServiceRegistry.java

SoundTrigger API improvements.

2016-01-27 12:49:20 -08:00

TabActivity.java

…

TaskStackBuilder.java

…

TimePickerDialog.java

Clean up TimePicker

2015-11-16 16:10:56 -05:00

UiAutomation.java

Merge "Add API for IME control by Accessibility Services."

2016-01-29 16:58:07 +00:00

UiAutomationConnection.java

Optionally support accessibility with UiAutomator

2016-01-28 10:09:05 -08:00

UiModeManager.java

Clean up night mode documentation

2016-01-12 15:04:18 -05:00

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

Keyguard wallpaper

2016-02-18 15:01:02 -08:00