Remove deprecated KeyEvent.Alt
Bug: 173080474
Test: N/A
Relnote: Deprecated KeyEvent.Alt is now removed. Use KeyEvent.isAltPressed instead.
Change-Id: Idd695fc17bdb5080f6af112cfe040494127975f0
diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index 9f00a14c..dc34923 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -865,15 +865,6 @@
package androidx.compose.ui.input.key {
- @Deprecated public interface Alt {
- method @Deprecated public boolean isLeftAltPressed();
- method @Deprecated public default boolean isPressed();
- method @Deprecated public boolean isRightAltPressed();
- property public abstract boolean isLeftAltPressed;
- property public default boolean isPressed;
- property public abstract boolean isRightAltPressed;
- }
-
public final inline class Key {
ctor public Key();
method public static int constructor-impl(int keyCode);
@@ -1468,7 +1459,6 @@
}
public interface KeyEvent {
- method @Deprecated public androidx.compose.ui.input.key.Alt getAlt();
method public int getKey-EK5gGoQ();
method public androidx.compose.ui.input.key.KeyEventType getType();
method public int getUtf16CodePoint();
@@ -1476,7 +1466,6 @@
method public boolean isCtrlPressed();
method public boolean isMetaPressed();
method public boolean isShiftPressed();
- property @Deprecated public abstract androidx.compose.ui.input.key.Alt alt;
property public abstract boolean isAltPressed;
property public abstract boolean isCtrlPressed;
property public abstract boolean isMetaPressed;
diff --git a/compose/ui/ui/api/public_plus_experimental_current.txt b/compose/ui/ui/api/public_plus_experimental_current.txt
index 9f00a14c..dc34923 100644
--- a/compose/ui/ui/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui/api/public_plus_experimental_current.txt
@@ -865,15 +865,6 @@
package androidx.compose.ui.input.key {
- @Deprecated public interface Alt {
- method @Deprecated public boolean isLeftAltPressed();
- method @Deprecated public default boolean isPressed();
- method @Deprecated public boolean isRightAltPressed();
- property public abstract boolean isLeftAltPressed;
- property public default boolean isPressed;
- property public abstract boolean isRightAltPressed;
- }
-
public final inline class Key {
ctor public Key();
method public static int constructor-impl(int keyCode);
@@ -1468,7 +1459,6 @@
}
public interface KeyEvent {
- method @Deprecated public androidx.compose.ui.input.key.Alt getAlt();
method public int getKey-EK5gGoQ();
method public androidx.compose.ui.input.key.KeyEventType getType();
method public int getUtf16CodePoint();
@@ -1476,7 +1466,6 @@
method public boolean isCtrlPressed();
method public boolean isMetaPressed();
method public boolean isShiftPressed();
- property @Deprecated public abstract androidx.compose.ui.input.key.Alt alt;
property public abstract boolean isAltPressed;
property public abstract boolean isCtrlPressed;
property public abstract boolean isMetaPressed;
diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index 1cffa60..bd17033 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -865,15 +865,6 @@
package androidx.compose.ui.input.key {
- @Deprecated public interface Alt {
- method @Deprecated public boolean isLeftAltPressed();
- method @Deprecated public default boolean isPressed();
- method @Deprecated public boolean isRightAltPressed();
- property public abstract boolean isLeftAltPressed;
- property public default boolean isPressed;
- property public abstract boolean isRightAltPressed;
- }
-
public final inline class Key {
ctor public Key();
method public static int constructor-impl(int keyCode);
@@ -1468,7 +1459,6 @@
}
public interface KeyEvent {
- method @Deprecated public androidx.compose.ui.input.key.Alt getAlt();
method public int getKey-EK5gGoQ();
method public androidx.compose.ui.input.key.KeyEventType getType();
method public int getUtf16CodePoint();
@@ -1476,7 +1466,6 @@
method public boolean isCtrlPressed();
method public boolean isMetaPressed();
method public boolean isShiftPressed();
- property @Deprecated public abstract androidx.compose.ui.input.key.Alt alt;
property public abstract boolean isAltPressed;
property public abstract boolean isCtrlPressed;
property public abstract boolean isMetaPressed;
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/input/key/KeyEventAndroid.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/input/key/KeyEventAndroid.kt
index 5aa92c0..1d4d09b 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/input/key/KeyEventAndroid.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/input/key/KeyEventAndroid.kt
@@ -18,9 +18,6 @@
import android.view.KeyEvent.ACTION_DOWN
import android.view.KeyEvent.ACTION_UP
-import android.view.KeyEvent.META_ALT_LEFT_ON
-import android.view.KeyEvent.META_ALT_MASK
-import android.view.KeyEvent.META_ALT_RIGHT_ON
import androidx.compose.ui.input.key.KeyEventType.KeyDown
import androidx.compose.ui.input.key.KeyEventType.KeyUp
import androidx.compose.ui.input.key.KeyEventType.Unknown
@@ -51,24 +48,4 @@
override val isShiftPressed: Boolean
get() = keyEvent.isShiftPressed
-
- @Suppress("DEPRECATION", "OverridingDeprecatedMember")
- override val alt: Alt
- get() = AltAndroid(keyEvent)
-}
-
-@Suppress("DEPRECATION")
-internal inline class AltAndroid(val keyEvent: AndroidKeyEvent) : Alt {
- override val isLeftAltPressed
- get() = (keyEvent.metaState and META_ALT_LEFT_ON) != 0
-
- override val isRightAltPressed
- get() = (keyEvent.metaState and META_ALT_RIGHT_ON) != 0
-
- /**
- * We override [isPressed] because Android has some synthetic meta states (eg. META_ALT_LOCKED)
- * and provides a META_ALT_MASK that can be used to check if the Alt key is pressed.
- */
- override val isPressed
- get() = (keyEvent.metaState and META_ALT_MASK) != 0
}
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/key/KeyEvent.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/key/KeyEvent.kt
index f957cd8..b5e4fa0 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/key/KeyEvent.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/input/key/KeyEvent.kt
@@ -68,17 +68,6 @@
* Indicates whether the Shift key is pressed.
*/
val isShiftPressed: Boolean
-
- /**
- * Indicates the status of the Alt key.
- */
- @Suppress("DEPRECATION")
- @Deprecated(
- "alt is replaced by isAltPressed",
- ReplaceWith("isAltPressed"),
- DeprecationLevel.ERROR
- )
- val alt: Alt
}
/**
@@ -100,28 +89,3 @@
*/
KeyDown
}
-
-/**
- * Indicates the status of the Alt key.
- */
-@Deprecated(
- message = "Alt is replaced by KeyEvent.isAltPressed",
- level = DeprecationLevel.WARNING
-)
-interface Alt {
- /**
- * Indicates whether the Alt key is pressed.
- */
- val isPressed: Boolean
- get() = isLeftAltPressed || isRightAltPressed
-
- /**
- * Indicates whether the left Alt key is pressed.
- */
- val isLeftAltPressed: Boolean
-
- /**
- * Indicates whether the right Alt key is pressed.
- */
- val isRightAltPressed: Boolean
-}
diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/input/key/KeyEventDesktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/input/key/KeyEventDesktop.kt
index ed20405..af0c990 100644
--- a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/input/key/KeyEventDesktop.kt
+++ b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/input/key/KeyEventDesktop.kt
@@ -46,18 +46,4 @@
override val isShiftPressed: Boolean
get() = keyEvent.isShiftDown
-
- @Suppress("DEPRECATION", "OverridingDeprecatedMember")
- override val alt: Alt
- get() = AltDesktop(keyEvent)
-}
-
-@Suppress("DEPRECATION")
-internal inline class AltDesktop(val keyEvent: KeyEventAwt) : Alt {
-
- override val isLeftAltPressed
- get() = keyEvent.isAltDown
-
- override val isRightAltPressed
- get() = keyEvent.isAltGraphDown
}
