diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java index 440ed6b15ac6..cdfad18311ad 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java @@ -69,7 +69,6 @@ public class RecentsConfiguration { public final int smallestWidth; /** Misc **/ - public boolean hasDockedTasks; public boolean useHardwareLayers; public boolean fakeShadows; public int svelteLevel; @@ -112,7 +111,6 @@ public class RecentsConfiguration { // settings or via multi window lockToAppEnabled = !ssp.hasFreeformWorkspaceSupport() && ssp.getSystemSetting(context, Settings.System.LOCK_TO_APP_ENABLED) != 0; - hasDockedTasks = ssp.hasDockedTask(); // Recompute some values based on the given state, since we can not rely on the resource // system to get certain values. diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java index c55f3830a80d..2920295038ee 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java @@ -27,6 +27,7 @@ import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent; import com.android.systemui.recents.events.ui.dragndrop.DragStartEvent; import com.android.systemui.recents.events.ui.dragndrop.DragStartInitializeDropTargetsEvent; import com.android.systemui.recents.misc.ReferenceCountedTrigger; +import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.model.Task; import com.android.systemui.recents.model.TaskStack; @@ -111,6 +112,7 @@ public class RecentsViewTouchHandler { /**** Events ****/ public final void onBusEvent(DragStartEvent event) { + SystemServicesProxy ssp = Recents.getSystemServices(); mRv.getParent().requestDisallowInterceptTouchEvent(true); mDragging = true; mDragTask = event.task; @@ -127,7 +129,7 @@ public class RecentsViewTouchHandler { mTaskView.setTranslationY(y); RecentsConfiguration config = Recents.getConfiguration(); - if (!config.hasDockedTasks) { + if (!ssp.hasDockedTask()) { // Add the dock state drop targets (these take priority) TaskStack.DockState[] dockStates = getDockStatesForCurrentOrientation(); for (TaskStack.DockState dockState : dockStates) { |