Dianne Hackborn 27e4266a4d Merge "resolved conflicts for merge of ed1a9c77 to master"

2011-06-10 19:24:49 -07:00

..

admin

New device policy to disable camera.

2011-06-10 09:37:17 -07:00

backup

Implement shared-storage full backup/restore

2011-06-07 12:16:27 -07:00

ActionBar.java

Action bar work for phones

2011-04-25 17:42:45 -07:00

Activity.java

Merge "resolved conflicts for merge of ed1a9c77 to master"

2011-06-10 19:24:49 -07:00

ActivityGroup.java

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

ActivityManager.java

resolved conflicts for merge of 590ec479 to master

2011-05-31 23:11:16 -07:00

ActivityManagerNative.java

resolved conflicts for merge of 590ec479 to master

2011-05-31 23:11:16 -07:00

ActivityThread.java

resolved conflicts for merge of e2aa0490 to master

2011-06-09 17:50:36 -07:00

AlarmManager.java

…

AlertDialog.java

Fix issue #3398767: Need translucent holo theme

2011-01-27 15:18:46 -08:00

AliasActivity.java

…

AppGlobals.java

NPE in in AppGlobals#getIntCoreSetting

2011-03-03 12:55:59 -08:00

Application.java

Work on issue #4518815: Compatibility mode introduces compatibility regression...

2011-06-08 18:45:43 -07:00

ApplicationErrorReport.java

…

ApplicationLoaders.java

…

ApplicationPackageManager.java

Break apart queries to getInstalled* API DO NOT MERGE

2011-05-26 09:53:24 -07:00

ApplicationThreadNative.java

DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.

2011-05-13 18:38:19 -07:00

BackStackRecord.java

DO NOT MERGE: Add custom fragment anims for popping backstack

2011-05-19 13:44:40 -07:00

ContextImpl.java

Work on issue #4518815: Compatibility mode introduces compatibility regression...

2011-06-08 18:45:43 -07:00

DatePickerDialog.java

…

Dialog.java

am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information >

2011-04-29 17:07:14 -07:00

DialogFragment.java

Fix issues #4087362 and #4087356

2011-03-11 13:48:32 -08:00

DownloadManager.java

bug:3513950 Rename "completedDownload" to "addCompletedDownload"

2011-03-07 11:51:14 -08:00

ExpandableListActivity.java

…

Fragment.java

Fix some problems with moving in and out of detached state.

2011-06-10 18:34:54 -07:00

FragmentBreadCrumbs.java

Rework thumbnail API to not suffer from IPC failures.

2011-02-16 18:53:31 -08:00

FragmentManager.java

Fix some problems with moving in and out of detached state.

2011-06-10 18:34:54 -07:00

FragmentTransaction.java

DO NOT MERGE: Add custom fragment anims for popping backstack

2011-05-19 13:44:40 -07:00

IActivityController.aidl

…

IActivityManager.java

resolved conflicts for merge of 590ec479 to master

2011-05-31 23:11:16 -07:00

IActivityPendingResult.aidl

…

IActivityWatcher.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

Restore from a previous full backup's tarfile

2011-06-01 15:09:55 -07:00

IBackupAgent.aidl

Restore from a previous full backup's tarfile

2011-06-01 15:09:55 -07:00

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

Ongoing notification for GPS use.

2011-02-03 21:11:46 -05:00

Instrumentation.java

resolved conflicts for merge of 77dd616e to master

2011-05-25 16:36:50 -07:00

IntentService.java

…

IProcessObserver.aidl

Observe screen on/off events in NetworkPolicy.

2011-05-23 18:39:56 -07:00

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IThumbnailReceiver.aidl

…

IThumbnailRetriever.aidl

Fix intermediate src dir for framework.jar

2011-05-18 09:48:40 -07:00

ITransientNotification.aidl

…

IUiModeManager.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.

2011-05-13 18:31:04 -07:00

LauncherActivity.java

…

ListActivity.java

Fix incorrect id name in ListActivity's documentation.

2011-02-22 11:24:15 -08:00

ListFragment.java

Fix some problems with moving in and out of detached state.

2011-06-10 18:34:54 -07:00

LoadedApk.java

Work on issue #4518815: Compatibility mode introduces compatibility regression...

2011-06-08 18:45:43 -07:00

LoaderManager.java

Fix some problems with moving in and out of detached state.

2011-06-10 18:34:54 -07:00

LocalActivityManager.java

Using proper key for removing from map.

2011-02-21 15:33:59 +01:00

NativeActivity.java

…

Notification.aidl

…

Notification.java

resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp

2011-03-15 11:54:46 -07:00

NotificationManager.java

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

OnActivityPausedListener.java

…

package.html

docs: fix misc broken links

2011-02-15 16:00:37 -08:00

PendingIntent.aidl

…

PendingIntent.java

…

ProgressDialog.java

…

QueuedWork.java

…

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

New opaque cab assets; search dialog tweaks.

2011-05-19 18:48:44 -07:00

SearchManager.java

New flag to open intent in a new tab.

2011-02-23 10:46:35 -05:00

Service.java

Add APIs to remove tasks.

2011-04-12 18:28:06 -07:00

SharedPreferencesImpl.java

…

StatusBarManager.java

Allow independent control of the back and the other navigation buttons.

2011-01-27 21:41:30 -08:00

TabActivity.java

…

TimePickerDialog.java

Fix Incorrect Times in TimePickerDialog

2011-02-01 17:56:29 -08:00

UiModeManager.java

Add "television" mode.

2011-05-23 15:11:08 -07:00

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

Optimize orientation changes.

2011-06-10 18:13:30 -07:00