Winson Chung bffce8ce7a resolved conflicts for cf426036 to stage-aosp-master ...

Change-Id: If1bd5860a2f7392df7f7d6fdb13cdc315d8fcc8c

2015-10-14 16:24:28 -07:00

..

accessibility

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

allapps

Merge "Adding graphic for all apps empty search screen." into ub-launcher3-burnaby

2015-08-28 21:08:49 +00:00

compat

Using the usermanager api to get creation time

2015-08-21 09:24:01 -07:00

config

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

model

Disabling home screen migration logic

2015-08-11 12:10:34 -07:00

testing

Adding market search.

2015-08-06 12:22:38 -07:00

util

Version code cleanup

2015-08-17 13:26:01 -07:00

widget

Fixing NPE in recycler view scroll bar.

2015-08-31 15:02:26 -07:00

Alarm.java

Adding optional first run activity to Launcher

2014-01-09 14:08:49 -08:00

AllAppsList.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

AppFilter.java

Add a better app filtering mechanism and filter widgets

2013-10-03 23:40:34 +01:00

AppInfo.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

AppWidgetResizeFrame.java

Calculating widget minSpans and spans statically/independent of orientation

2015-08-03 16:39:49 -07:00

AppWidgetsRestoredReceiver.java

Disabling auto restore of widgets.

2015-08-14 11:42:01 -07:00

AutoInstallsLayout.java

Always log if Package is missing while loading default workspace

2015-08-06 14:07:49 -07:00

BaseContainerView.java

Fixing issue with miscalculation in updating container bounds.

2015-08-06 15:30:08 -07:00

BaseRecyclerView.java

Tweaking fast scroller to follow touch closer.

2015-08-20 19:25:48 +00:00

BaseRecyclerViewFastScrollBar.java

Fixing an issue where you would inadvertently start fastscrolling.

2015-08-27 10:19:48 -07:00

BaseRecyclerViewFastScrollPopup.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

BorderCropDrawable.java

Updating Clings UI

2014-08-27 10:57:03 -07:00

BubbleTextView.java

Version code cleanup

2015-08-17 13:26:01 -07:00

BuildInfo.java

Allow DISABLE_ALL_APPS to be set using a system property.

2014-01-09 17:21:09 -08:00

ButtonDropTarget.java

Version code cleanup

2015-08-17 13:26:01 -07:00

CellLayout.java

Calculating widget minSpans and spans statically/independent of orientation

2015-08-03 16:39:49 -07:00

CheckLongPressHelper.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

ClickShadowView.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

CommonAppTypeParser.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

CustomAppWidget.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

DefaultLayoutParser.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

DeferredHandler.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

DeleteDropTarget.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

DeviceProfile.java

Refactoring search bar animations.

2015-08-05 12:04:06 -07:00

DragController.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

DragLayer.java

Refactoring search bar animations.

2015-08-05 12:04:06 -07:00

DragScroller.java

Launcher2 is now Launcher3.

2013-06-05 23:30:20 -04:00

DragSource.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

DragView.java

Version code cleanup

2015-08-17 13:26:01 -07:00

DropTarget.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

DummyWidget.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

ExtendedEditText.java

Refactoring to ExtendedEditText.

2015-08-13 15:58:51 -07:00

FastBitmapDrawable.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

FirstFrameAnimatorHelper.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

FocusHelper.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

FocusIndicatorView.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

Folder.java

Version code cleanup

2015-08-17 13:26:01 -07:00

FolderIcon.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

FolderInfo.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

FolderPagedView.java

Loading high resolution icons for first 3 items in a folder

2015-08-04 11:05:15 -07:00

HolographicOutlineHelper.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

Hotseat.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

IconCache.java

Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app

2015-08-28 10:27:41 -07:00

InfoDropTarget.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

Insettable.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

InsettableFrameLayout.java

Make sure DragLayer layout params are of the correct type

2014-10-28 16:16:46 -07:00

InstallShortcutReceiver.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

InterruptibleInOutAnimator.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

InvariantDeviceProfile.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

ItemInfo.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

Launcher.java

resolved conflicts for cf426036 to stage-aosp-master

2015-10-14 16:24:28 -07:00

LauncherAnimUtils.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

LauncherAppState.java

Version code cleanup

2015-08-17 13:26:01 -07:00

LauncherAppWidgetHost.java

Refreshing widget list when a package containing a widget changes

2015-08-11 21:25:19 -07:00

LauncherAppWidgetHostView.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

LauncherAppWidgetInfo.java

Calculating widget minSpans and spans statically/independent of orientation

2015-08-03 16:39:49 -07:00

LauncherAppWidgetProviderInfo.java

Calculating widget minSpans and spans statically/independent of orientation

2015-08-03 16:39:49 -07:00

LauncherBackupAgentHelper.java

Version code cleanup

2015-08-17 13:26:01 -07:00

LauncherBackupHelper.java

Disabling home screen migration logic

2015-08-11 12:10:34 -07:00

LauncherCallbacks.java

Adding market search.

2015-08-06 12:22:38 -07:00

LauncherClings.java

Fixing work folder addition logic

2015-08-20 11:25:02 -07:00

LauncherFiles.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

LauncherModel.java

Removing items which are on invalid screen

2015-09-04 15:26:17 -07:00

LauncherProvider.java

Restoring provider behavior for reloading app on old devices

2015-09-09 09:38:52 -07:00

LauncherProviderChangeListener.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

LauncherRootView.java

Allow LauncherOverlay to access and manage insets

2014-10-24 11:47:30 -07:00

LauncherScroller.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

LauncherSettings.java

Homescreen migration from a larger grid to a smaller grid.

2015-07-31 12:03:33 -07:00

LauncherStateTransitionAnimation.java

Version code cleanup

2015-08-17 13:26:01 -07:00

LauncherTransitionable.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

LauncherViewPropertyAnimator.java

Refactoring search bar animations.

2015-08-05 12:04:06 -07:00

LogAccelerateInterpolator.java

Preliminary work on Material Transitions

2014-07-18 17:56:42 -07:00

LogDecelerateInterpolator.java

Preliminary work on Material Transitions

2014-07-18 17:56:42 -07:00

MainThreadExecutor.java

Fix skia crash in widget preview loading

2014-04-16 14:16:14 +02:00

MemoryDumpActivity.java

Further MemoryTracker robustness:

2013-07-07 23:13:51 -05:00

MemoryTracker.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

OnAlarmListener.java

Adding optional first run activity to Launcher

2014-01-09 14:08:49 -08:00

PagedView.java

Version code cleanup

2015-08-17 13:26:01 -07:00

PageIndicator.java

Clean up imports

2013-12-13 16:20:53 +01:00

PageIndicatorMarker.java

Clean up imports

2013-12-13 16:20:53 +01:00

Partner.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

PendingAddItemInfo.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

PendingAppWidgetHostView.java

Version code cleanup

2015-08-17 13:26:01 -07:00

PreloadIconDrawable.java

Preventing zoom-in animation from running everytime the app updates.

2015-08-11 15:18:02 -07:00

SearchDropTargetBar.java

Fixing issue with search bar not being visible.

2015-08-20 22:29:49 +00:00

SettingsActivity.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

ShortcutAndWidgetContainer.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

ShortcutInfo.java

Loading high resolution icons for first 3 items in a folder

2015-08-04 11:05:15 -07:00

SpringLoadedDragController.java

Launcher2 is now Launcher3.

2013-06-05 23:30:20 -04:00

StartupReceiver.java

Fixing spell correcton

2014-07-29 11:49:35 -07:00

Stats.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

StylusEventHelper.java

Removing call to isButtonPressed as its only Lollipop and above

2015-08-17 13:04:40 -07:00

ToggleWeightWatcher.java

Adding switch to toggle Memory Overlay

2013-07-19 14:32:09 -07:00

UninstallDropTarget.java

Version code cleanup

2015-08-17 13:26:01 -07:00

Utilities.java

Showing a permission prompt for direct call shortcuts

2015-10-14 15:20:11 -07:00

WallpaperChangedReceiver.java

Set App context from WallpaperChanged receiver. (Bug 12525684)

2014-01-13 10:05:37 -08:00

WeightWatcher.java

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

WidgetPreviewLoader.java

Refreshing widget list when a package containing a widget changes

2015-08-11 21:25:19 -07:00

Workspace.java

Preventing null pointer crash when opening a folder

2015-09-03 09:48:50 -07:00

WorkspaceStateTransitionAnimation.java

Refactoring search bar animations.

2015-08-05 12:04:06 -07:00