Remove PointerInputNode and PointerInputWrapper.
They are no longer in use and have been replaced with
PointerInputFilter.
Bug: NA.
Test: NA.
Change-Id: I31afc584554c76fe0b017d9ceb9c044427b24be9
diff --git a/ui/ui-core/api/0.1.0-dev12.txt b/ui/ui-core/api/0.1.0-dev12.txt
index 1996b5b..0d29899 100644
--- a/ui/ui-core/api/0.1.0-dev12.txt
+++ b/ui/ui-core/api/0.1.0-dev12.txt
@@ -810,26 +810,6 @@
method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
}
- public final class PointerInputNode extends androidx.ui.core.ComponentNode {
- ctor public PointerInputNode();
- method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
- method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
- method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
- method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
- method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
- method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
- method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
- property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
- property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
- property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
- property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
- }
-
- public final class PointerInputWrapperKt {
- method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- }
-
public final class PopupKt {
method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
diff --git a/ui/ui-core/api/current.txt b/ui/ui-core/api/current.txt
index 1996b5b..0d29899 100644
--- a/ui/ui-core/api/current.txt
+++ b/ui/ui-core/api/current.txt
@@ -810,26 +810,6 @@
method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
}
- public final class PointerInputNode extends androidx.ui.core.ComponentNode {
- ctor public PointerInputNode();
- method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
- method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
- method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
- method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
- method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
- method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
- method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
- property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
- property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
- property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
- property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
- }
-
- public final class PointerInputWrapperKt {
- method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- }
-
public final class PopupKt {
method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
diff --git a/ui/ui-core/api/public_plus_experimental_0.1.0-dev12.txt b/ui/ui-core/api/public_plus_experimental_0.1.0-dev12.txt
index e4965f4..64137f8 100644
--- a/ui/ui-core/api/public_plus_experimental_0.1.0-dev12.txt
+++ b/ui/ui-core/api/public_plus_experimental_0.1.0-dev12.txt
@@ -812,26 +812,6 @@
method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
}
- public final class PointerInputNode extends androidx.ui.core.ComponentNode {
- ctor public PointerInputNode();
- method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
- method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
- method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
- method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
- method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
- method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
- method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
- property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
- property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
- property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
- property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
- }
-
- public final class PointerInputWrapperKt {
- method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- }
-
public final class PopupKt {
method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
diff --git a/ui/ui-core/api/public_plus_experimental_current.txt b/ui/ui-core/api/public_plus_experimental_current.txt
index e4965f4..64137f8 100644
--- a/ui/ui-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-core/api/public_plus_experimental_current.txt
@@ -812,26 +812,6 @@
method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
}
- public final class PointerInputNode extends androidx.ui.core.ComponentNode {
- ctor public PointerInputNode();
- method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
- method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
- method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
- method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
- method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
- method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
- method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
- property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
- property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
- property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
- property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
- }
-
- public final class PointerInputWrapperKt {
- method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- }
-
public final class PopupKt {
method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
diff --git a/ui/ui-core/api/restricted_0.1.0-dev12.txt b/ui/ui-core/api/restricted_0.1.0-dev12.txt
index f09213b..1b17b7b 100644
--- a/ui/ui-core/api/restricted_0.1.0-dev12.txt
+++ b/ui/ui-core/api/restricted_0.1.0-dev12.txt
@@ -820,26 +820,6 @@
method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
}
- public final class PointerInputNode extends androidx.ui.core.ComponentNode {
- ctor public PointerInputNode();
- method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
- method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
- method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
- method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
- method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
- method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
- method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
- property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
- property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
- property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
- property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
- }
-
- public final class PointerInputWrapperKt {
- method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- }
-
public final class PopupKt {
method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
diff --git a/ui/ui-core/api/restricted_current.txt b/ui/ui-core/api/restricted_current.txt
index f09213b..1b17b7b 100644
--- a/ui/ui-core/api/restricted_current.txt
+++ b/ui/ui-core/api/restricted_current.txt
@@ -820,26 +820,6 @@
method public static boolean positionChangedIgnoreConsumed(androidx.ui.core.PointerInputChange);
}
- public final class PointerInputNode extends androidx.ui.core.ComponentNode {
- ctor public PointerInputNode();
- method public kotlin.jvm.functions.Function0<kotlin.Unit> getCancelHandler();
- method public kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? getCustomEventHandler();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? getInitHandler();
- method public kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> getPointerInputHandler();
- method public void setCancelHandler(kotlin.jvm.functions.Function0<kotlin.Unit> p);
- method public void setCustomEventHandler(kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? p);
- method public void setInitHandler(kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? p);
- method public void setPointerInputHandler(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> p);
- property public final kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler;
- property public final kotlin.jvm.functions.Function2<androidx.ui.core.CustomEvent,androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler;
- property public final kotlin.jvm.functions.Function1<androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler;
- property public final kotlin.jvm.functions.Function3<java.util.List<androidx.ui.core.PointerInputChange>,androidx.ui.core.PointerEventPass,androidx.ui.unit.IntPxSize,java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler;
- }
-
- public final class PointerInputWrapperKt {
- method public static inline void PointerInput(kotlin.jvm.functions.Function3<? super java.util.List<androidx.ui.core.PointerInputChange>,? super androidx.ui.core.PointerEventPass,? super androidx.ui.unit.IntPxSize,? extends java.util.List<androidx.ui.core.PointerInputChange>> pointerInputHandler, kotlin.jvm.functions.Function0<kotlin.Unit> cancelHandler, kotlin.jvm.functions.Function1<? super androidx.ui.core.CustomEventDispatcher,kotlin.Unit>? initHandler = null, kotlin.jvm.functions.Function2<? super androidx.ui.core.CustomEvent,? super androidx.ui.core.PointerEventPass,kotlin.Unit>? customEventHandler = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- }
-
public final class PopupKt {
method public static void DropdownPopup(androidx.ui.core.DropDownAlignment dropDownAlignment = androidx.ui.core.DropDownAlignment.Start, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void Popup(androidx.ui.core.Alignment alignment = Alignment.TopStart, androidx.ui.unit.IntPxPosition offset = IntPxPosition(IntPx.Zero, IntPx.Zero), androidx.ui.core.PopupProperties popupProperties = androidx.ui.core.PopupProperties(), kotlin.jvm.functions.Function0<kotlin.Unit> children);
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/ComponentNodes.kt b/ui/ui-core/src/main/java/androidx/ui/core/ComponentNodes.kt
index 1984062..260119f 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/ComponentNodes.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/ComponentNodes.kt
@@ -287,49 +287,6 @@
*/
fun ComponentNode.isAttached() = owner != null
-// TODO(b/143778512): Why are the properties vars? Shouldn't they be vals defined in the
-// constructor such that they both must be provided?
-/**
- * Backing node for handling pointer events.
- */
-class PointerInputNode : ComponentNode() {
-
- /**
- * Invoked right after the [PointerInputNode] is hit by a pointer during hit testing.
- *
- * @See CustomEventDispatcher
- */
- var initHandler: ((CustomEventDispatcher) -> Unit)? = null
-
- /**
- * Invoked when pointers that previously hit this PointerInputNode have changed.
- */
- var pointerInputHandler: PointerInputHandler = { event, _, _ -> event }
-
- /**
- * Invoked when a [CustomEvent] is dispatched by a [PointerInputNode].
- *
- * Dispatch occurs over all passes of [PointerEventPass].
- *
- * The [CustomEvent] is the event being dispatched. The [PointerEventPass] is the pass that
- * dispatch is currently on.
- *
- * @see CustomEvent
- * @see PointerEventPass
- */
- var customEventHandler: ((CustomEvent, PointerEventPass) -> Unit)? = null
-
- /**
- * Invoked to notify the handler that no more calls to pointerInputHandler will be made, until
- * at least new pointers exist. This can occur for a few reasons:
- * 1. Android dispatches ACTION_CANCEL to [AndroidComposeView.onTouchEvent].
- * 2. The PointerInputNode has been removed from the compose hierarchy.
- * 3. The PointerInputNode no longer has any descendant [LayoutNode]s and therefore does not
- * know what region of the screen it should virtually exist in.
- */
- var cancelHandler: () -> Unit = { }
-}
-
/**
* Backing node that implements focus.
*
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/PointerInputWrapper.kt b/ui/ui-core/src/main/java/androidx/ui/core/PointerInputWrapper.kt
deleted file mode 100644
index e05d427..0000000
--- a/ui/ui-core/src/main/java/androidx/ui/core/PointerInputWrapper.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.ui.core
-
-import androidx.compose.Composable
-
-/**
- * [PointerInput] is the compose ui core component for receiving and interacting with pointer
- * input.
- *
- * Pointer input includes all user input related to 2d positioning on the screen. This includes
- * (but is not necessarily limited to) fingers touching the screen, a mouse moving across the
- * screen, and stylus input.
- *
- * [PointerInput] takes the virtual size of all of it's descendant [Layout] nodes and when a
- * pointer comes in contact with the screen, hit testing is automatically done using that virtual
- * size.
- *
- * [pointerInputHandler] is invoked when pointers that have hit tested positive change.
- *
- * [cancelHandler] is invoked to notify the handler that no more calls to pointerInputHandler will
- * be made, until at least new pointers exist. This can occur for a few reasons:
- * 1. Android dispatches ACTION_CANCEL to [AndroidComposeView.onTouchEvent].
- * 2. The PointerInputNode has been removed from the compose hierarchy.
- * 3. The PointerInputNode no longer has any descendant [LayoutNode]s and therefore does not
- * know what region of the screen it should virtually exist in.
- *
- * [initHandler] is invoked right after the [PointerInputNode] is hit tested and provides an
- * implementation of [CustomEventDispatcher].
- *
- * [customEventHandler] is invoked whenever another [PointerInput] uses CustomEventDispatcher
- * to send a custom event to other [PointerInput]s.
- *
- * @param pointerInputHandler Invoked when pointers that have hit this [PointerInput] change.
- * @param cancelHandler Invoked when a cancellation event occurs.
- * @param initHandler Invoked when an implementation of [CustomEventDispatcher] is provided.
- * @param customEventHandler Invoked when another [PointerInput] dispatches a [CustomEvent].
- * @param children The children composable that will be composed as a child, or children, of this
- * [PointerInput].
- *
- * @see CustomEventDispatcher]
- */
-@Composable
-inline fun PointerInput(
- noinline pointerInputHandler: PointerInputHandler,
- noinline cancelHandler: () -> Unit,
- noinline initHandler: ((CustomEventDispatcher) -> Unit)? = null,
- noinline customEventHandler: ((CustomEvent, PointerEventPass) -> Unit)? = null,
- crossinline children: @Composable () -> Unit
-) {
- // Hide the internals of PointerInputNode.
- PointerInputNode(
- initHandler = initHandler,
- pointerInputHandler = pointerInputHandler,
- customEventHandler = customEventHandler,
- cancelHandler = cancelHandler
- ) {
- children()
- }
-}
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/pointerinput/HitPathTracker.kt b/ui/ui-core/src/main/java/androidx/ui/core/pointerinput/HitPathTracker.kt
index 122f836..28c943f 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/pointerinput/HitPathTracker.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/pointerinput/HitPathTracker.kt
@@ -118,7 +118,7 @@
) {
val associatedPointers = dispatchingNode.pointerIds
- // TODO(b/124523868): It may be more efficient for PointerInputNodes to be able to opt in
+ // TODO(b/124523868): It may be more efficient for PointerInputFilters to be able to opt in
// or out of passes.
root.dispatchCustomEvent(
event,
@@ -373,8 +373,7 @@
upPass: PointerEventPass?,
dispatchingNode: Node
) {
- // If we have a PointerInputNode and we don't contain any of the relevant pointers, stop
- // and back track up the tree.
+ // If we aren't tracking any of the relevant pointers, return.
if (!relevantPointers.any { pointerIds.contains(it) }) {
return
}
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/pointerinput/PointerInput.kt b/ui/ui-core/src/main/java/androidx/ui/core/pointerinput/PointerInput.kt
index fa572ee..dc3969c 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/pointerinput/PointerInput.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/pointerinput/PointerInput.kt
@@ -22,7 +22,6 @@
import androidx.ui.core.Modifier
import androidx.ui.core.PointerEventPass
import androidx.ui.core.PointerInputChange
-import androidx.ui.core.PointerInputNode
import androidx.ui.unit.IntPxPosition
import androidx.ui.unit.IntPxSize
import androidx.ui.unit.PxPosition
@@ -80,7 +79,7 @@
open fun onInit(customEventDispatcher: CustomEventDispatcher) {}
/**
- * Invoked when a [CustomEvent] is dispatched by a [PointerInputNode].
+ * Invoked when a [CustomEvent] is dispatched by a [PointerInputFilter].
*
* Dispatch occurs over all passes of [PointerEventPass].
*
diff --git a/ui/ui-core/src/test/java/androidx/ui/core/ComponentNodeTest.kt b/ui/ui-core/src/test/java/androidx/ui/core/ComponentNodeTest.kt
index 025de42..414d668 100644
--- a/ui/ui-core/src/test/java/androidx/ui/core/ComponentNodeTest.kt
+++ b/ui/ui-core/src/test/java/androidx/ui/core/ComponentNodeTest.kt
@@ -210,7 +210,7 @@
@Test
fun childAdd() {
- val node = PointerInputNode()
+ val node = LayoutNode()
val owner = mock(Owner::class.java)
node.attach(owner)
verify(owner, times(1)).onAttach(node)
@@ -225,16 +225,16 @@
@Test
fun childCount() {
- val node = PointerInputNode()
+ val node = LayoutNode()
assertEquals(0, node.count)
- node.insertAt(0, PointerInputNode())
+ node.insertAt(0, LayoutNode())
assertEquals(1, node.count)
}
@Test
fun childGet() {
- val node = PointerInputNode()
- val child = PointerInputNode()
+ val node = LayoutNode()
+ val child = LayoutNode()
node.insertAt(0, child)
assertEquals(child, node[0])
}
@@ -249,7 +249,7 @@
@Test
fun childRemove() {
- val node = PointerInputNode()
+ val node = LayoutNode()
val owner = mock(Owner::class.java)
node.attach(owner)
val child = DrawNode()
@@ -294,59 +294,11 @@
assertNull(childLayoutNode.parentLayoutNode)
}
- // layoutNode hierarchy should be set properly when a GestureNode is a child of a LayoutNode
- @Test
- fun directLayoutAndGestureNodesHierarchy() {
- val layoutNode = LayoutNode()
- val singleChildNode = PointerInputNode()
- layoutNode.insertAt(0, singleChildNode)
-
- assertNull(layoutNode.parentLayoutNode)
- assertEquals(layoutNode, singleChildNode.parentLayoutNode)
- val layoutNodeChildren = findLayoutNodeChildren(layoutNode)
- assertEquals(0, layoutNodeChildren.size)
-
- val childLayoutNodes = findLayoutNodeChildren(singleChildNode)
- assertEquals(0, childLayoutNodes.size)
-
- layoutNode.removeAt(index = 0, count = 1)
- assertNull(singleChildNode.parentLayoutNode)
- }
-
- // layoutNode hierarchy should be set properly when a LayoutNode is a grandchild of a LayoutNode
- @Test
- fun indirectLayoutNodeHierarchy() {
- val layoutNode = LayoutNode()
- val intermediate = PointerInputNode()
- val childLayoutNode = LayoutNode()
- layoutNode.insertAt(0, intermediate)
- assertEquals(layoutNode, intermediate.parentLayoutNode)
-
- intermediate.insertAt(0, childLayoutNode)
-
- assertNull(layoutNode.parentLayoutNode)
- assertEquals(layoutNode, childLayoutNode.parentLayoutNode)
-
- val layoutNodeChildren = findLayoutNodeChildren(layoutNode)
- assertEquals(1, layoutNodeChildren.size)
- assertEquals(childLayoutNode, layoutNodeChildren[0])
-
- val intermediateLayoutNodeChildren = findLayoutNodeChildren(intermediate)
- assertEquals(1, intermediateLayoutNodeChildren.size)
- assertEquals(childLayoutNode, intermediateLayoutNodeChildren[0])
-
- intermediate.removeAt(index = 0, count = 1)
- assertNull(childLayoutNode.parentLayoutNode)
-
- val intermediateLayoutNodeChildren2 = findLayoutNodeChildren(intermediate)
- assertEquals(0, intermediateLayoutNodeChildren2.size)
- }
-
- // Test visitChildren() for LayoutNode and a SingleChildNode
+ // Test visitChildren() for nodes.
@Test
fun visitChildren() {
val (node1, node2, node3) = createSimpleLayout()
- val node4 = PointerInputNode()
+ val node4 = LayoutNode()
node3.insertAt(0, node4)
val nodes = mutableListOf<ComponentNode>()
node1.visitChildren { nodes.add(it) }
@@ -682,71 +634,71 @@
// ComponentNode shouldn't allow adding beyond the count
@Test
fun testAddBeyondCurrent() {
- val pointerInputNode = PointerInputNode()
+ val node = LayoutNode()
thrown.expect(IndexOutOfBoundsException::class.java)
- pointerInputNode.insertAt(1, DrawNode())
+ node.insertAt(1, DrawNode())
}
// ComponentNode shouldn't allow adding below 0
@Test
fun testAddBelowZero() {
- val pointerInputNode = PointerInputNode()
+ val node = LayoutNode()
thrown.expect(IndexOutOfBoundsException::class.java)
- pointerInputNode.insertAt(-1, DrawNode())
+ node.insertAt(-1, DrawNode())
}
// ComponentNode should error when removing at index < 0
@Test
fun testRemoveNegativeIndex() {
- val pointerInputNode = PointerInputNode()
- pointerInputNode.insertAt(0, DrawNode())
+ val node = LayoutNode()
+ node.insertAt(0, DrawNode())
thrown.expect(IndexOutOfBoundsException::class.java)
- pointerInputNode.removeAt(-1, 1)
+ node.removeAt(-1, 1)
}
// ComponentNode should error when removing at index > count
@Test
fun testRemoveBeyondIndex() {
- val pointerInputNode = PointerInputNode()
- pointerInputNode.insertAt(0, DrawNode())
+ val node = LayoutNode()
+ node.insertAt(0, DrawNode())
thrown.expect(IndexOutOfBoundsException::class.java)
- pointerInputNode.removeAt(1, 1)
+ node.removeAt(1, 1)
}
// ComponentNode should error when removing at count < 0
@Test
fun testRemoveNegativeCount() {
- val pointerInputNode = PointerInputNode()
- pointerInputNode.insertAt(0, DrawNode())
+ val node = LayoutNode()
+ node.insertAt(0, DrawNode())
thrown.expect(IllegalArgumentException::class.java)
- pointerInputNode.removeAt(0, -1)
+ node.removeAt(0, -1)
}
// ComponentNode should error when removing at count > entry count
@Test
- fun testReplaceoMany() {
- val pointerInputNode = PointerInputNode()
- pointerInputNode.insertAt(0, DrawNode())
+ fun testRemoveWithIndexBeyondSize() {
+ val node = LayoutNode()
+ node.insertAt(0, DrawNode())
thrown.expect(IndexOutOfBoundsException::class.java)
- pointerInputNode.removeAt(0, 2)
+ node.removeAt(0, 2)
}
// ComponentNode should error when there aren't enough items
@Test
- fun testReplaceoMany2() {
- val pointerInputNode = PointerInputNode()
+ fun testRemoveWithIndexEqualToSize() {
+ val node = LayoutNode()
thrown.expect(IndexOutOfBoundsException::class.java)
- pointerInputNode.removeAt(0, 1)
+ node.removeAt(0, 1)
}
// ComponentNode should allow removing two items
@Test
fun testRemoveTwoItems() {
- val pointerInputNode = PointerInputNode()
- pointerInputNode.insertAt(0, DrawNode())
- pointerInputNode.insertAt(0, DrawNode())
- pointerInputNode.removeAt(0, 2)
- assertEquals(0, pointerInputNode.count)
+ val node = LayoutNode()
+ node.insertAt(0, DrawNode())
+ node.insertAt(0, DrawNode())
+ node.removeAt(0, 2)
+ assertEquals(0, node.count)
}
// The layout coordinates of a LayoutNode should be attached when
diff --git a/ui/ui-core/src/test/java/androidx/ui/core/pointerinput/HitPathTrackerTest.kt b/ui/ui-core/src/test/java/androidx/ui/core/pointerinput/HitPathTrackerTest.kt
index c16611b..deb3212 100644
--- a/ui/ui-core/src/test/java/androidx/ui/core/pointerinput/HitPathTrackerTest.kt
+++ b/ui/ui-core/src/test/java/androidx/ui/core/pointerinput/HitPathTrackerTest.kt
@@ -2273,35 +2273,35 @@
// Pin -> Ln
@Test
fun processCancel_singlePin_cancelHandlerIsCalled() {
- val pointerInputNode: PointerInputFilter = PointerInputFilterMock()
- hitPathTracker.addHitPath(PointerId(3), listOf(pointerInputNode))
+ val pif: PointerInputFilter = PointerInputFilterMock()
+ hitPathTracker.addHitPath(PointerId(3), listOf(pif))
hitPathTracker.processCancel()
- verify(pointerInputNode).onCancel()
+ verify(pif).onCancel()
}
// Pin -> Pin -> Pin
@Test
fun processCancel_3Pins_cancelHandlersCalledOnceInOrder() {
- val pointerInputNodeChild: PointerInputFilter = PointerInputFilterMock()
- val pointerInputNodeMiddle: PointerInputFilter = PointerInputFilterMock()
- val pointerInputNodeParent: PointerInputFilter = PointerInputFilterMock()
+ val childPif: PointerInputFilter = PointerInputFilterMock()
+ val middlePif: PointerInputFilter = PointerInputFilterMock()
+ val parentPif: PointerInputFilter = PointerInputFilterMock()
hitPathTracker.addHitPath(
PointerId(3),
- listOf(pointerInputNodeParent, pointerInputNodeMiddle, pointerInputNodeChild)
+ listOf(parentPif, middlePif, childPif)
)
hitPathTracker.processCancel()
inOrder(
- pointerInputNodeParent,
- pointerInputNodeMiddle,
- pointerInputNodeChild
+ parentPif,
+ middlePif,
+ childPif
) {
- verify(pointerInputNodeChild).onCancel()
- verify(pointerInputNodeMiddle).onCancel()
- verify(pointerInputNodeParent).onCancel()
+ verify(childPif).onCancel()
+ verify(middlePif).onCancel()
+ verify(parentPif).onCancel()
}
}
@@ -2354,8 +2354,8 @@
// Pin -> Ln
@Test
fun processCancel_singlePin_cleared() {
- val pointerInputNode: PointerInputFilter = PointerInputFilterMock()
- hitPathTracker.addHitPath(PointerId(3), listOf(pointerInputNode))
+ val pif: PointerInputFilter = PointerInputFilterMock()
+ hitPathTracker.addHitPath(PointerId(3), listOf(pif))
hitPathTracker.processCancel()
@@ -2365,12 +2365,12 @@
// Pin -> Pin -> Pin
@Test
fun processCancel_3Pins_cleared() {
- val pointerInputNodeChild: PointerInputFilter = PointerInputFilterMock()
- val pointerInputNodeMiddle: PointerInputFilter = PointerInputFilterMock()
- val pointerInputNodeParent: PointerInputFilter = PointerInputFilterMock()
+ val childPif: PointerInputFilter = PointerInputFilterMock()
+ val middlePif: PointerInputFilter = PointerInputFilterMock()
+ val parentPif: PointerInputFilter = PointerInputFilterMock()
hitPathTracker.addHitPath(
PointerId(3),
- listOf(pointerInputNodeParent, pointerInputNodeMiddle, pointerInputNodeChild)
+ listOf(parentPif, middlePif, childPif)
)
hitPathTracker.processCancel()