diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-02-27 10:07:13 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-02-27 10:09:09 -0800 |
commit | a535ae423bdb3272095e8d83b4c9deff342227b1 (patch) | |
tree | 5a6e401320600260e0481ddee58c35470f20a88d /src/com/android/launcher3/Launcher.java | |
parent | 54d4e645b3c2b2c153e97f776e33685b292f8c2b (diff) | |
download | android_packages_apps_Trebuchet-a535ae423bdb3272095e8d83b4c9deff342227b1.tar.gz android_packages_apps_Trebuchet-a535ae423bdb3272095e8d83b4c9deff342227b1.tar.bz2 android_packages_apps_Trebuchet-a535ae423bdb3272095e8d83b4c9deff342227b1.zip |
Moving Event dispatcher definition from LAuncher to BaseActivity so that
it can be used in other activities as well.
Bug: 34766840
Change-Id: Ie4b723483792bee93fb75e63146ebea7dfeebeda
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 624ea4a54..74e6bfc84 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -85,9 +85,6 @@ import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.allapps.DefaultAppSearchController; import com.android.launcher3.anim.AnimationLayerSet; -import com.android.launcher3.model.ModelWriter; -import com.android.launcher3.notification.NotificationListener; -import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.PinItemRequestCompat; @@ -106,10 +103,13 @@ import com.android.launcher3.keyboard.CustomActionsPopup; import com.android.launcher3.keyboard.ViewGroupFocusHelper; import com.android.launcher3.logging.FileLog; import com.android.launcher3.logging.UserEventDispatcher; +import com.android.launcher3.model.ModelWriter; import com.android.launcher3.model.PackageItemInfo; import com.android.launcher3.model.WidgetItem; +import com.android.launcher3.notification.NotificationListener; import com.android.launcher3.pageindicators.PageIndicator; import com.android.launcher3.popup.PopupContainerWithArrow; +import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.shortcuts.ShortcutKey; import com.android.launcher3.userevent.nano.LauncherLogProto; @@ -119,7 +119,6 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType; import com.android.launcher3.util.ActivityResultInfo; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.ItemInfoMatcher; -import com.android.launcher3.util.LogConfig; import com.android.launcher3.util.MultiHashMap; import com.android.launcher3.util.PackageManagerHelper; import com.android.launcher3.util.PackageUserKey; @@ -315,8 +314,6 @@ public class Launcher extends BaseActivity */ private PendingRequestArgs mPendingRequestArgs; - private UserEventDispatcher mUserEventDispatcher; - private float mLastDispatchTouchEventX = 0.0f; public ViewGroupFocusHelper mFocusHandler; @@ -627,23 +624,6 @@ public class Launcher extends BaseActivity } } - public UserEventDispatcher getUserEventDispatcher() { - if (mLauncherCallbacks != null) { - UserEventDispatcher dispatcher = mLauncherCallbacks.getUserEventDispatcher(); - if (dispatcher != null) { - return dispatcher; - } - } - - // Logger object is a singleton and does not have to be coupled with the foreground - // activity. Since most user event logging is done on the UI, the object is retrieved - // from the callback for convenience. - if (mUserEventDispatcher == null) { - mUserEventDispatcher = new UserEventDispatcher(); - } - return mUserEventDispatcher; - } - public boolean isDraggingEnabled() { // We prevent dragging when we are loading the workspace as it is possible to pick up a view // that is subsequently removed from the workspace in startBinding(). |