Brad Fitzpatrick 70588bf864 resolved conflicts for merge of 3a2c6bf0 to master ...

Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe

2011-01-05 14:04:06 -08:00

..

admin

API CHANGE - Add hasGrantedPolicy() API

2010-12-09 09:22:06 -08:00

backup

Don't restore wildly wrong sized wallpapers

2010-12-13 16:41:24 -08:00

ActionBar.java

Revisiting ActionBar API and layout.

2011-01-05 11:41:26 -08:00

Activity.java

Time to remove some old APIs!

2010-12-14 22:19:03 -08:00

ActivityGroup.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ActivityManager.java

Add some standard definitions for device heaps.

2010-12-23 15:41:16 -08:00

ActivityManagerNative.java

Rework activity lifecycle so onSaveInstanceState() is after onPause().

2010-12-08 00:35:27 -08:00

ActivityThread.java

Work around issue #3241701: crash in ActivityThread.handleWindowVisibility

2010-12-14 11:28:01 -08:00

AlarmManager.java

Add an AlarmManager API to set the system time (with the proper permissions).

2010-02-05 12:31:41 -08:00

AlertDialog.java

resolved conflicts for merge of 3a2c6bf0 to master

2011-01-05 14:04:06 -08:00

AliasActivity.java

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

AppGlobals.java

Some ActivityThread/ActivityManager cleanup.

2010-06-24 15:20:48 -07:00

Application.java

Fix issue #3152415: Various confusions in docs about Application

2010-11-01 09:49:37 -07:00

ApplicationErrorReport.java

Add dumping of Running Service reports to ApplicationErrorReports

2010-08-03 15:02:12 +02:00

ApplicationLoaders.java

Allow native shared libraries in ASEC containers

2010-08-27 16:40:06 -07:00

ApplicationPackageManager.java

Fix launching of activities that I broke.

2010-12-15 00:20:27 -08:00

ApplicationThreadNative.java

Fix issue #3274841: Orientation change problem with a paused activity

2010-12-13 12:57:02 -08:00

BackStackRecord.java

Fix issue #3258849: Grab thumbnail when exiting an app via back

2010-12-13 20:41:17 -08:00

ContextImpl.java

Add MODE_MULTI_PROCESS flag to Context.getSharedPreferences()

2010-12-14 16:27:21 -08:00

DatePickerDialog.java

Adding APIs for setting whether to show week number and setting the start day of week. Cleaned up the code a bit.

2010-12-28 02:40:23 -08:00

Dialog.java

Again maybe fix issue #3169193...

2011-01-03 13:58:14 -08:00

DialogFragment.java

Fix animations to use correct interpolator.

2010-11-08 15:28:12 -08:00

DownloadManager.java

if a download dir doesn't exist, create it or fail fast

2010-12-19 20:33:54 -08:00

ExpandableListActivity.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

Fragment.java

Some new API cleanup.

2011-01-04 17:42:01 -08:00

FragmentBreadCrumbs.java

Add a way to insert a parent bread crumb so that deep linked settings can navigate up.

2010-12-14 15:17:32 -08:00

FragmentManager.java

Few little fragment, wm tweaks.

2011-01-04 11:34:18 -08:00

FragmentTransaction.java

Fix summary for FragmentTransaction.show()

2010-11-09 20:37:03 -08:00

FullBackupAgent.java

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

IActivityController.aidl

Fix issue #3022508: Crash during media scan

2010-09-23 15:59:28 -07:00

IActivityManager.java

Rework activity lifecycle so onSaveInstanceState() is after onPause().

2010-12-08 00:35:27 -08:00

IActivityPendingResult.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IActivityWatcher.aidl

donut snapshot

2009-07-31 17:38:20 -07:00

IAlarmManager.aidl

Add an AlarmManager API to set the system time (with the proper permissions).

2010-02-05 12:31:41 -08:00

IApplicationThread.java

Fix issue #3274841: Orientation change problem with a paused activity

2010-12-13 12:57:02 -08:00

IBackupAgent.aidl

Refactor android.backup => android.app.backup

2010-03-05 16:27:15 -08:00

IInstrumentationWatcher.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

INotificationManager.aidl

add a optional String to the key of notifications to allow users

2009-09-25 16:01:22 -07:00

Instrumentation.java

Implement issue #3221502: New APIs to support new back stack / task navigation

2010-11-22 18:35:55 -08:00

IntentService.java

Fix SDK build.

2010-04-07 13:54:49 +08:00

ISearchManager.aidl

Clean up global search and web search activity finding

2010-02-23 14:27:43 +00:00

ISearchManagerCallback.aidl

donut snapshot

2009-07-21 11:16:54 -07:00

IServiceConnection.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IThumbnailReceiver.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ITransientNotification.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IUiModeManager.aidl

Fix issue #2581524: Car home icon should always go to car home

2010-04-09 16:49:08 -07:00

IWallpaperManager.aidl

Implement all of the infrastructure for configuring wallpapers.

2009-09-07 22:48:02 -07:00

IWallpaperManagerCallback.aidl

First bit of wallpaper work.

2009-08-05 21:29:42 -07:00

KeyguardManager.java

Fix SDK build.

2010-06-07 21:19:16 -07:00

LauncherActivity.java

For extra large devices, use a dialog style for LauncherActivity.

2010-11-03 11:26:02 -07:00

ListActivity.java

fix xml sample error

2010-08-05 15:44:26 -07:00

ListFragment.java

Add new DialogFragment class.

2010-07-24 11:42:05 -07:00

LoadedApk.java

Don't warn on reading from disk during initial class loading.

2010-11-09 14:25:12 -08:00

LoaderManager.java

Fix issue #3301572: onCreateLoader must not be a member class: VolumeMetadataLoader

2010-12-21 11:12:09 -08:00

LocalActivityManager.java

Correctly save Activity's state in saveInstanceState

2010-12-22 13:05:52 -08:00

NativeActivity.java

Tell system server whether the app handled input events.

2010-11-08 12:49:43 -08:00

Notification.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Notification.java

Notification.Builder.setAutoCancel() was setting the wrong flag.

2011-01-04 18:12:32 -08:00

NotificationManager.java

am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"

2010-11-02 15:00:06 -07:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PendingIntent.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PendingIntent.java

Implement issue #3221502: New APIs to support new back stack / task navigation

2010-11-22 18:35:55 -08:00

ProgressDialog.java

Revised assets for progress bars and indeterminate progress spinners.

2010-11-12 19:06:40 -08:00

QueuedWork.java

Add facility for broadcasts receives to do work asynchronously.

2010-10-27 17:13:29 -07:00

ResultInfo.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SearchableInfo.aidl

Move android.server.search.SearchableInfo to android.app

2009-12-04 12:52:51 +00:00

SearchableInfo.java

Guard against NPE in SearchManagerService

2010-04-06 14:48:41 +01:00

SearchDialog.java

Use SearchView in SearchDialog for legacy apps using the old model.

2010-12-03 11:18:25 -08:00

SearchManager.java

Query refinement feature in SearchView.

2010-09-16 06:37:26 -07:00

Service.java

Time to remove some old APIs!

2010-12-14 22:19:03 -08:00

SharedPreferencesImpl.java

Make getSharedPreference() async, blocking on first access.

2010-12-07 10:50:36 -08:00

StatusBarManager.java

Hide navigation buttons and clock on lockscreen.

2010-12-03 15:55:04 -05:00

TabActivity.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TimePickerDialog.java

Bug 3191746. atePicker TimePicker: Dark theme is used in a Light theme app

2010-12-17 16:00:18 -08:00

UiModeManager.java

Fix issue #2581524: Car home icon should always go to car home

2010-04-09 16:49:08 -07:00

WallpaperInfo.aidl

Implement all of the infrastructure for configuring wallpapers.

2009-09-07 22:48:02 -07:00

WallpaperInfo.java

Fix some bugs.

2010-03-04 11:52:14 -08:00

WallpaperManager.java

Added some pieces for Wallpaper previews

2010-12-08 19:37:59 -08:00