vadimt 1ac98548a7 resolve merge conflicts of 08776ada1e to ub-launcher3-qt-future-dev ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Merged-in: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082

2019-10-03 20:58:15 +00:00

..

accessibility

Fix the issue deep shortcuts cannot be added to workspace via

2019-09-12 20:33:03 +00:00

allapps

Support defining X column layout for all apps as a display option.

2019-09-16 16:24:59 -07:00

anim

Merge "Adding support for building a "spring like animation" with precomputed values" into ub-launcher3-qt-qpr1-dev

2019-09-11 20:16:19 +00:00

compat

migrate custom widgets in comply with plugin framework

2019-09-25 15:58:41 -07:00

config

migrate custom widgets in comply with plugin framework

2019-09-25 15:58:41 -07:00

dot

Sending notification and widget changes to a listner so that

2019-02-11 16:23:11 -08:00

dragndrop

Add nullcheck for VelocityTracker

2019-10-02 18:23:03 +00:00

folder

Fix notification dot scale in AllApps with grid size enabled

2019-09-27 14:49:54 -07:00

graphics

Drag and drop preview size for BubbleTextView

2019-09-26 12:21:45 -07:00

icons

Revert "Revert "Revert "cache shourtcut image"""

2019-10-01 09:44:11 -07:00

keyboard

…

logging

plugin for user event logging

2019-09-19 07:53:09 -07:00

model

App title in Widget list shouldn't be actionable by a11y methods

2019-10-01 17:33:18 +00:00

notification

Some cleanup for SwipeDetector.

2019-10-01 14:38:56 -07:00

pageindicators

…

popup

Merge "Adding debug tracing for a flake" into ub-launcher3-qt-qpr1-dev

2019-09-28 01:07:55 -07:00

provider

Merge "Fix bug where we incorrectly change the default profile id of the database." into ub-launcher3-qt-qpr1-dev

2019-09-03 11:17:14 -07:00

qsb

Add support for searchwidget in layout files.

2019-08-23 10:58:13 -07:00

settings

Add developer options for grid change for Styles

2019-05-16 13:38:38 -07:00

shortcuts

Removing ShortcutInfoCompat and directly using ShortcutInfo

2019-04-22 15:39:40 -07:00

states

Moving various common executors to a single location

2019-08-20 14:36:17 -07:00

testing

resolve merge conflicts of 08776ada1e to ub-launcher3-qt-future-dev

2019-10-03 20:58:15 +00:00

touch

Some cleanup for SwipeDetector.

2019-10-01 14:38:56 -07:00

util

Key by both package and user for list of active install sessions.

2019-09-17 12:00:03 -07:00

views

Fix ScrimView caret alignment and ignore touches

2019-09-26 16:30:46 -07:00

widget

migrate custom widgets in comply with plugin framework

2019-09-25 15:58:41 -07:00

AbstractFloatingView.java

Fix the issue talkback feedback doesn't say anything when user long

2019-10-03 07:47:33 -07:00

Alarm.java

…

AppFilter.java

…

AppInfo.java

Add a "Dismiss" option for predicted apps in Launcher

2019-08-13 23:57:11 +00:00

AppWidgetResizeFrame.java

Add system gesture exclusion rects for widget resize handles

2019-04-03 21:07:13 +00:00

AppWidgetsRestoredReceiver.java

Fix bug where work profile widgets are restored with main profile provider.

2019-07-30 09:03:12 -07:00

AutoInstallsLayout.java

Add support for searchwidget in layout files.

2019-08-23 10:58:13 -07:00

BaseActivity.java

Defer listening on widget host until after the state transition ends

2019-09-09 10:24:53 -07:00

BaseDraggingActivity.java

Migrate to using DefaultDisplay

2019-09-09 10:21:28 -07:00

BaseRecyclerView.java

Removing flinging via UI Automator

2019-09-04 16:35:19 -07:00

BubbleTextView.java

Fix notification dot scale in AllApps with grid size enabled

2019-09-27 14:49:54 -07:00

ButtonDropTarget.java

…

CellLayout.java

Refactoring some folder binding logic:

2019-08-14 12:03:09 -07:00

CheckLongPressHelper.java

Remove tracing for fixed bugs

2019-05-01 16:10:56 -07:00

DefaultLayoutParser.java

Add support for searchwidget in layout files.

2019-08-23 10:58:13 -07:00

DeleteDropTarget.java

Log undo button click

2019-04-25 14:22:54 -07:00

DeviceProfile.java

Fix notification dot scale in AllApps with grid size enabled

2019-09-27 14:49:54 -07:00

DragSource.java

…

DropTarget.java

Fix bug in getVisualCenter where we do not offset by the dragRegion.

2019-01-04 14:30:26 -08:00

DropTargetBar.java

Clear should not show after Widget Configuration activity

2019-05-01 16:33:31 -07:00

ExtendedEditText.java

…

FastBitmapDrawable.java

Update app open/close animations.

2019-09-04 21:45:05 +00:00

FirstFrameAnimatorHelper.java

Using the first frame delay based on the display refresh rate instead of

2019-07-24 10:12:37 -07:00

FocusHelper.java

…

FolderInfo.java

Lazily binding folder pages and icons

2019-09-05 17:17:11 +00:00

Hotseat.java

Enable touches on hotseat area

2019-09-19 11:22:27 -07:00

IconProvider.java

Adding support for storing keywords in iconCache

2019-08-14 22:12:49 +00:00

Insettable.java

…

InsettableFrameLayout.java

…

InstallShortcutReceiver.java

Merge "Fix NPE when trying to construct WorkspaceItemInfo with null intent data." into ub-launcher3-qt-qpr1-dev

2019-09-25 15:26:07 -07:00

InterruptibleInOutAnimator.java

…

InvariantDeviceProfile.java

Support defining X column layout for all apps as a display option.

2019-09-16 16:24:59 -07:00

ItemInfo.java

add null check when accessing target component from iteminfo

2019-08-16 21:50:21 +00:00

ItemInfoWithIcon.java

Add a "Dismiss" option for predicted apps in Launcher

2019-08-13 23:57:11 +00:00

Launcher.java

migrate custom widgets in comply with plugin framework

2019-09-25 15:58:41 -07:00

LauncherAnimUtils.java

Using FloatProperty for spring animation, instead of a interface

2019-06-19 21:31:43 -07:00

LauncherAppState.java

migrate custom widgets in comply with plugin framework

2019-09-25 15:58:41 -07:00

LauncherAppTransitionManager.java

Cleaning up some animation states:

2019-06-21 12:47:56 -07:00

LauncherAppWidgetHost.java

migrate custom widgets in comply with plugin framework

2019-09-25 15:58:41 -07:00

LauncherAppWidgetInfo.java

Add support for searchwidget in layout files.

2019-08-23 10:58:13 -07:00

LauncherAppWidgetProviderInfo.java

…

LauncherBackupAgent.java

…

LauncherCallbacks.java

Fixing interactive state for background states and

2019-05-30 11:59:29 -07:00

LauncherExterns.java

…

LauncherFiles.java

…

LauncherModel.java

migrate custom widgets in comply with plugin framework

2019-09-25 15:58:41 -07:00

LauncherProvider.java

Moving some utilities methods to separate class

2019-07-17 15:15:07 -07:00

LauncherProviderChangeListener.java

…

LauncherRootView.java

Updating consumed insets when dispatching to child views

2019-06-12 12:15:16 -07:00

LauncherSettings.java

App title in Widget list shouldn't be actionable by a11y methods

2019-10-01 17:33:18 +00:00

LauncherState.java

Add OverviewScrim to show below overview but above workspace

2019-07-31 14:44:28 -07:00

LauncherStateManager.java

Merge "Removing debug tracing for flakes that stopped reproing" into ub-launcher3-qt-qpr1-dev

2019-09-23 14:56:04 -07:00

LogAccelerateInterpolator.java

…

LogDecelerateInterpolator.java

…

MainProcessInitializer.java

Adding utility method to get adaptive icon scale

2019-05-03 21:31:46 -07:00

OnAlarmListener.java

…

PagedView.java

removed extra test protocol for unit test

2019-09-30 18:34:49 +00:00

Partner.java

Moving some utilities methods to separate class

2019-07-17 15:15:07 -07:00

PendingAddItemInfo.java

…

PromiseAppInfo.java

ShortcutInfo renamed to WorkspaceItemInfo

2019-04-16 00:08:24 -07:00

ResourceUtils.java

Reading navigation_bar_gesture_height for bottom swipe region

2019-05-23 10:42:24 -07:00

SecondaryDropTarget.java

Add Logs to track app uninstall and icon removal

2019-09-16 14:35:44 -07:00

SessionCommitReceiver.java

Add support for adding promise icons for new install sessions by user.

2019-08-22 10:42:45 -07:00

ShortcutAndWidgetContainer.java

Initial changes to creating a fake landscape Launcher UI

2019-05-02 10:59:28 -07:00

SimpleOnStylusPressListener.java

…

StylusEventHelper.java

…

Utilities.java

[DO NOT MERGE] Fix NumberFormatException for launcher.

2019-08-29 19:10:28 +00:00

WidgetPreviewLoader.java

Moving various common executors to a single location

2019-08-20 14:36:17 -07:00

Workspace.java

Merge "Adding debug tracing for a flake" into ub-launcher3-qt-qpr1-dev

2019-09-28 01:07:55 -07:00

WorkspaceItemInfo.java

Fixed a bug where restored promise icons stay promise icons.

2019-09-24 19:40:30 +00:00

WorkspaceLayoutManager.java

…

WorkspaceStateTransitionAnimation.java

Some improvements to home to overview transition for 0 button mode

2019-06-19 14:48:57 -07:00