Brad Fitzpatrick 0486f78ef3 am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp ...

Merge commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d'

* commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d':
  Fix a race between requesting/loading/writing SharedPreferences.

2010-09-07 22:10:41 -07:00

..

admin

Removed extra parameter tag in JavaDocs

2010-08-04 18:34:12 -07:00

backup

Make SharedPreferencesBackupHelper wait for async SharedPreference writes

2010-09-06 22:18:39 -07:00

ActionBar.java

Reworking the ActionBar tab API

2010-09-07 21:02:12 -07:00

Activity.java

Bring back instances counts to dumpsys meminfo.

2010-09-03 16:57:53 -07:00

ActivityGroup.java

…

ActivityManager.java

These are not ready to be exposed. Also rename them to be better.

2010-09-03 12:51:28 -07:00

ActivityManagerNative.java

Remove experimental immersive mode support. DO NOT MERGE

2010-08-27 22:57:39 -04:00

ActivityThread.java

Bring back instances counts to dumpsys meminfo.

2010-09-03 16:57:53 -07:00

AlarmManager.java

…

AlertDialog.java

merge from open-source master

2010-06-18 12:44:20 -07:00

AliasActivity.java

…

AppGlobals.java

Some ActivityThread/ActivityManager cleanup.

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

Application.java

…

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

ApplicationThreadNative.java

Allow "am" to initiate heap dumps.

2010-07-12 13:35:14 -07:00

BackStackEntry.java

Reworking the ActionBar tab API

2010-09-07 21:02:12 -07:00

ContextImpl.java

am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp

2010-09-07 22:10:41 -07:00

DatePickerDialog.java

am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-19 17:40:10 -07:00

Dialog.java

Add facilities for layout transitions

2010-08-24 13:09:20 -07:00

DialogFragment.java

Work on DialogFragment and docs.

2010-08-20 18:32:41 -07:00

ExpandableListActivity.java

…

Fragment.java

Work on DialogFragment and docs.

2010-08-20 18:32:41 -07:00

FragmentManager.java

Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work...

2010-08-26 15:56:59 -07:00

FragmentTransaction.java

Reworking the ActionBar tab API

2010-09-07 21:02:12 -07:00

FullBackupAgent.java

…

IActivityController.aidl

…

IActivityManager.java

Remove experimental immersive mode support. DO NOT MERGE

2010-08-27 22:57:39 -04:00

IActivityPendingResult.aidl

…

IActivityWatcher.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

Allow "am" to initiate heap dumps.

2010-07-12 13:35:14 -07:00

IBackupAgent.aidl

…

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

…

Instrumentation.java

More fragment stuff:

2010-05-14 11:22:48 -07:00

IntentService.java

Fix SDK build.

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

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IThumbnailReceiver.aidl

…

ITransientNotification.aidl

…

IUiModeManager.aidl

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

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

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

Fix SDK build.

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

LauncherActivity.java

…

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

Allow native shared libraries in ASEC containers

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

LoaderManager.java

This may fix LoaderManager bug where a closed cursor could be used.

2010-08-09 16:32:52 -07:00

LoaderManagingFragment.java

Improvements to ListFragment.

2010-06-28 15:17:44 -07:00

LocalActivityManager.java

Fix memory leak in LocalActivityManager. Also properly removes embedded activities.

2010-06-03 11:03:18 -07:00

NativeActivity.java

Use new nativeLibraryPath field for NativeActivity

2010-09-07 10:44:21 -07:00

Notification.aidl

…

Notification.java

resolved conflicts for merge of 6a3ffb5b to master

2010-09-03 16:40:58 -07:00

NotificationManager.java

Fix crash when startForeground posts a broken Notification.

2010-08-04 10:52:51 -04:00

package.html

…

PendingIntent.aidl

…

PendingIntent.java

…

ProgressDialog.java

…

QueuedWork.java

SharedPreferences$Editor.startCommit()

2010-08-27 09:10:11 -07:00

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

Guard against NPE in SearchManagerService

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

SearchDialog.java

Recover a handful of commits that were reverted earlier

2010-06-21 13:46:59 -07:00

SearchManager.java

…

Service.java

Add missing word from docs.

2010-08-02 07:54:18 -07:00

StatusBarManager.java

Start moving resources to SystemUI.apk.

2010-06-02 14:48:45 -07:00

SuggestionsAdapter.java

For search suggestions in the search dialog, allow the 'title'

2010-04-15 11:35:47 -04:00

TabActivity.java

…

TimePickerDialog.java

am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-19 17:40:10 -07: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

…

WallpaperInfo.java

…

WallpaperManager.java

…