Adam Cohen 2e52c90b3f resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby ...

Change-Id: I29aa5b37968b1ced81cdeb68a021db9310047252

2015-04-06 13:11:38 -07:00

..

compat

Check the code point instead of the character when determining digit sections.

2015-03-24 15:23:51 -07:00

config

Prevent the inlining of ProviderConfig.AUTHORITY

2014-09-23 18:08:58 -07:00

util

Removing all dependencies of launcher code on wallpaper-picker

2015-03-20 18:16:58 -07:00

Alarm.java

Adding optional first run activity to Launcher

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

AllAppsList.java

Lazy loading high res icons

2015-03-17 15:05:23 -07:00

AlphabeticalAppsList.java

Minor changes to apps view.

2015-03-13 11:48:45 -07:00

AppFilter.java

Add a better app filtering mechanism and filter widgets

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

AppInfo.java

Lazy loading high res icons

2015-03-17 15:05:23 -07:00

AppsContainerRecyclerView.java

Ensuring that we fast-scroll to the first section app.

2015-03-30 15:28:43 -07:00

AppsContainerView.java

Ensure that we are not using the new View constructor.

2015-03-24 16:31:45 -07:00

AppsCustomizeCellLayout.java

Fix regression which was causing requestLayout in layout pass

2014-08-28 10:10:13 -07:00

AppsCustomizePagedView.java

Rewrite: Widget preview loader logic

2015-03-20 17:31:11 -07:00

AppsCustomizeTabHost.java

Initial changes to break out AllApps into its own view.

2015-03-10 18:14:22 -07:00

AppsGridAdapter.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

AppsListAdapter.java

Minor changes to apps view.

2015-03-13 11:48:45 -07:00

AppWidgetResizeFrame.java

Supporting custom widgets provided by launcher

2014-12-05 16:18:41 -08:00

AppWidgetsRestoredReceiver.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00

AutoInstallsLayout.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00

BorderCropDrawable.java

Updating Clings UI

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

BubbleTextView.java

Lazy loading high res icons

2015-03-17 15:05:23 -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

Revert "Adding debugging and naive fix for issue 15334203"

2014-06-04 01:24:03 +00:00

CellLayout.java

Removing more code with API 21 dependencies.

2015-03-24 18:02:01 -07:00

CheckLongPressHelper.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

CommonAppTypeParser.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

CustomAppWidget.java

Supporting custom widgets provided by launcher

2014-12-05 16:18:41 -08:00

DefaultLayoutParser.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

DeferredHandler.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

DeleteDropTarget.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

DeviceProfile.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

DragController.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

DragLayer.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

DragScroller.java

Launcher2 is now Launcher3.

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

DragSource.java

Generalize support for 'App Info', 'Uninstall' and 'Delete'

2013-11-28 10:17:07 +00:00

DragView.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

DropTarget.java

Enabling accessible drag and drop

2015-03-09 11:29:28 -07:00

DummyWidget.java

Supporting custom widgets provided by launcher

2014-12-05 16:18:41 -08:00

DynamicGrid.java

Removed disableAllApps flag

2015-02-26 12:35:09 -08:00

FastBitmapDrawable.java

Fixing Intrinsic dimensions of FastBitmapDrawable

2014-09-05 07:07:09 -07:00

FastBitmapView.java

Updating the icon click feedback

2014-08-19 18:03:06 -07:00

FirstFrameAnimatorHelper.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

FocusHelper.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

FocusIndicatorView.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

Folder.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00

FolderCellLayout.java

Adding sort switch in FolderPagedView

2015-03-17 14:49:38 -07:00

FolderEditText.java

Launcher2 is now Launcher3.

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

FolderIcon.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

FolderInfo.java

Adding sort switch in FolderPagedView

2015-03-17 14:49:38 -07:00

FolderPagedView.java

Updating pageindicator assets

2015-03-30 10:15:50 -07:00

HolographicOutlineHelper.java

Updating the icon click feedback

2014-08-19 18:03:06 -07:00

Hotseat.java

Removed disableAllApps flag

2015-02-26 12:35:09 -08:00

IconCache.java

Adding a system status column in icon cache & invalidating items based on it

2015-04-01 16:05:34 -07:00

InfoDropTarget.java

Adding accessibility controls

2015-01-16 17:40:41 -08:00

Insettable.java

Add system window inset support to DragLayer and children.

2013-09-11 16:29:34 -04:00

InsettableFrameLayout.java

Make sure DragLayer layout params are of the correct type

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

InstallShortcutReceiver.java

Rewrite: Widget preview loader logic

2015-03-20 17:31:11 -07:00

InterruptibleInOutAnimator.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

ItemInfo.java

Rewrite: Widget preview loader logic

2015-03-20 17:31:11 -07:00

Launcher.java

resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby

2015-04-06 13:11:38 -07:00

LauncherAccessibilityDelegate.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

LauncherAnimatorUpdateListener.java

Launcher2 is now Launcher3.

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

LauncherAnimUtils.java

Further refinement of all apps / widgets transition

2014-08-13 21:39:48 +00:00

LauncherApplication.java

Lazily instantiate LauncherAppState.

2013-06-27 15:17:11 -04:00

LauncherAppState.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00

LauncherAppWidgetHost.java

Fix widget refresh issue on package install/uninstall

2015-03-11 17:40:23 -07:00

LauncherAppWidgetHostView.java

Fixing crash when dragging and dropping a restored widget.

2015-02-17 12:00:30 -08:00

LauncherAppWidgetInfo.java

Supporting custom widgets provided by launcher

2014-12-05 16:18:41 -08:00

LauncherAppWidgetProviderInfo.java

Removing more code with API 21 dependencies.

2015-03-24 18:02:01 -07:00

LauncherBackupAgentHelper.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00

LauncherBackupHelper.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00

LauncherCallbacks.java

Adding Launcher3 callbacks for trimming memory.

2015-03-30 23:57:46 +01:00

LauncherClings.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

LauncherExtension.java

Adding Launcher3 callbacks for trimming memory.

2015-03-30 23:57:46 +01:00

LauncherFiles.java

Removing all dependencies of launcher code on wallpaper-picker

2015-03-20 18:16:58 -07:00

LauncherModel.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00

LauncherProvider.java

Adding nullcheck when getting app restrictions

2015-04-06 10:46:01 -07:00

LauncherProviderChangeListener.java

Add LauncherProviderChangeListener

2014-03-17 15:13:01 -07:00

LauncherRootView.java

Allow LauncherOverlay to access and manage insets

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

LauncherScroller.java

Syncing up state transition with paging transition

2013-11-18 15:21:29 +00:00

LauncherSettings.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00

LauncherStateTransitionAnimation.java

Removing more code with API 21 dependencies.

2015-03-24 18:02:01 -07:00

LauncherViewPropertyAnimator.java

Make some changes for transparent system bars

2013-10-01 11:56:43 -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

Clean up unused code

2013-08-28 15:06:31 +02:00

OnAlarmListener.java

Adding optional first run activity to Launcher

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

PackageChangedReceiver.java

Rewrite: Widget preview loader logic

2015-03-20 17:31:11 -07:00

PagedView.java

Disabling overscroll when folder has only one page

2015-03-26 13:38:27 -07:00

PagedViewGridLayout.java

Updating the widget tray

2014-08-11 15:40:37 +00:00

PagedViewWidget.java

Rewrite: Widget preview loader logic

2015-03-20 17:31:11 -07:00

PagedViewWidgetImageView.java

Clearing some android list errors/warnings.

2014-11-03 11:39:27 -08:00

PagedViewWithDraggableItems.java

Initial changes to break out AllApps into its own view.

2015-03-10 18:14:22 -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

Add ability for Partner customization apk to override certain DeviceProfile params

2014-09-04 15:12:55 +00:00

PendingAddItemInfo.java

Supporting custom widgets provided by launcher

2014-12-05 16:18:41 -08:00

PendingAppWidgetHostView.java

Showing widgets in a disabled state, when running in safe mode

2014-10-16 11:20:41 -07:00

PreloadIconDrawable.java

Adding accessibility controls

2015-01-16 17:40:41 -08:00

SearchDropTargetBar.java

Enabling accessible drag and drop

2015-03-09 11:29:28 -07:00

ShortcutAndWidgetContainer.java

Supporting custom widgets provided by launcher

2014-12-05 16:18:41 -08:00

ShortcutInfo.java

Lazy loading high res icons

2015-03-17 15:05:23 -07:00

SmoothPagedView.java

Syncing up state transition with paging transition

2013-11-18 15:21:29 +00: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

Removing unused logging

2015-03-19 10:21:53 -07:00

ToggleWeightWatcher.java

Adding switch to toggle Memory Overlay

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

UninstallShortcutReceiver.java

Removing UninstallShortcutReceiver

2015-04-01 10:11:11 -07:00

UserInitializeReceiver.java

Clean up unused code

2013-08-28 15:06:31 +02:00

Utilities.java

Rewrite: Widget preview loader logic

2015-03-20 17:31:11 -07:00

WallpaperChangedReceiver.java

Set App context from WallpaperChanged receiver. (Bug 12525684)

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

WeightWatcher.java

Reducing method count by eliminating synthetic accessors

2015-03-20 11:15:54 -07:00

WidgetPreviewLoader.java

Rewrite: Widget preview loader logic

2015-03-20 17:31:11 -07:00

WidgetsContainerView.java

Removing more code with API 21 dependencies.

2015-03-24 18:02:01 -07:00

Workspace.java

Removing ContentObserver from LauncherModel, and calling reload

2015-04-01 10:20:18 -07:00