ndk: Extend new flags

Author: MarijnS95

ndk/src/event.rs

@@ -326,6 +326,63 @@ pub enum Axis {
     Generic15 = ffi::AMOTION_EVENT_AXIS_GENERIC_15 as i32,
     Generic16 = ffi::AMOTION_EVENT_AXIS_GENERIC_16 as i32,
 
+    /// Axis constant: X gesture offset axis of a motion event.
+    ///
+    /// - For a touch pad, reports the distance that a swipe gesture has moved in the X axis, as a
+    ///   proportion of the touch pad's size. For example, if a touch pad is `1000` units wide, and
+    ///   a swipe gesture starts at `X = 500` then moves to `X = 400`, this axis would have a value
+    ///   of `-0.1`.
+    ///
+    /// These values are relative to the state from the last event, not accumulated, so developers
+    /// should make sure to process this axis value for all batched historical events.
+    ///
+    /// This axis is only set on the first pointer in a motion event.
+    #[doc(alias = "AMOTION_EVENT_AXIS_GESTURE_X_OFFSET")]
+    GestureXOffset = ffi::AMOTION_EVENT_AXIS_GESTURE_X_OFFSET as i32,
+    /// Axis constant: Y gesture offset axis of a motion event.
+    ///
+    /// The same as [`Axis::GestureXOffset`], but for the Y axis.
+    #[doc(alias = "AMOTION_EVENT_AXIS_GESTURE_Y_OFFSET")]
+    GestureYOffset = ffi::AMOTION_EVENT_AXIS_GESTURE_Y_OFFSET as i32,
+    /// Axis constant: X scroll distance axis of a motion event.
+    ///
+    /// - For a touch pad, reports the distance that should be scrolled in the X axis as a result of
+    ///   the user's two-finger scroll gesture, in display pixels.
+    ///
+    /// These values are relative to the state from the last event, not accumulated, so developers
+    /// should make sure to process this axis value for all batched historical events.
+    ///
+    /// This axis is only set on the first pointer in a motion event.
+    #[doc(alias = "AMOTION_EVENT_AXIS_GESTURE_SCROLL_X_DISTANCE")]
+    GestureScrollXDistance = ffi::AMOTION_EVENT_AXIS_GESTURE_SCROLL_X_DISTANCE as i32,
+    /// Axis constant: Y scroll distance axis of a motion event.
+    ///
+    /// The same as [`Axis::GestureScrollXDistance`], but for the Y axis.
+    #[doc(alias = "AMOTION_EVENT_AXIS_GESTURE_SCROLL_Y_DISTANCE")]
+    GestureScrollYDistance = ffi::AMOTION_EVENT_AXIS_GESTURE_SCROLL_Y_DISTANCE as i32,
+    /// Axis constant: pinch scale factor of a motion event.
+    ///
+    /// - For a touch pad, reports the change in distance between the fingers when the user is
+    ///   making a pinch gesture, as a proportion of that distance when the gesture was last
+    ///   reported. For example, if the fingers were `50` units apart and are now `52` units apart,
+    ///   the scale factor would be `1.04`.
+    ///
+    /// These values are relative to the state from the last event, not accumulated, so developers
+    /// should make sure to process this axis value for all batched historical events.
+    ///
+    /// This axis is only set on the first pointer in a motion event.
+    #[doc(alias = "AMOTION_EVENT_AXIS_GESTURE_PINCH_SCALE_FACTOR")]
+    GesturePinchScaleFactor = ffi::AMOTION_EVENT_AXIS_GESTURE_PINCH_SCALE_FACTOR as i32,
+    /// Axis constant: the number of fingers being used in a multi-finger swipe gesture.
+    ///
+    /// - For a touch pad, reports the number of fingers being used in a multi-finger swipe gesture
+    ///   (with [`MotionClassification::MultiFingerSwipe`]).
+    ///
+    /// Since [`MotionClassification::MultiFingerSwipe`] is a hidden API, so is this axis. It is
+    /// only set on the first pointer in a motion event.
+    #[doc(alias = "AMOTION_EVENT_AXIS_GESTURE_SWIPE_FINGER_COUNT")]
+    GestureSwipeFingerCount = ffi::AMOTION_EVENT_AXIS_GESTURE_SWIPE_FINGER_COUNT as i32,
+
     #[doc(hidden)]
     #[num_enum(catch_all)]
     __Unknown(i32),
@@ -573,7 +630,7 @@ impl MotionEvent {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getmetastate)
     #[inline]
     pub fn meta_state(&self) -> MetaState {
-        unsafe { MetaState(ffi::AMotionEvent_getMetaState(self.ptr.as_ptr()) as u32) }
+        MetaState(unsafe { ffi::AMotionEvent_getMetaState(self.ptr.as_ptr()) } as u32)
     }
 
     /// Returns the button state during this event, as a bitfield.
@@ -582,7 +639,7 @@ impl MotionEvent {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getbuttonstate)
     #[inline]
     pub fn button_state(&self) -> ButtonState {
-        unsafe { ButtonState(ffi::AMotionEvent_getButtonState(self.ptr.as_ptr()) as u32) }
+        ButtonState(unsafe { ffi::AMotionEvent_getButtonState(self.ptr.as_ptr()) } as u32)
     }
 
     /// Returns the time of the start of this gesture, in the `java.lang.System.nanoTime()` time
@@ -601,7 +658,7 @@ impl MotionEvent {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getedgeflags)
     #[inline]
     pub fn edge_flags(&self) -> EdgeFlags {
-        unsafe { EdgeFlags(ffi::AMotionEvent_getEdgeFlags(self.ptr.as_ptr()) as u32) }
+        EdgeFlags(unsafe { ffi::AMotionEvent_getEdgeFlags(self.ptr.as_ptr()) } as u32)
     }
 
     /// Returns the time of this event, in the `java.lang.System.nanoTime()` time base
@@ -619,7 +676,7 @@ impl MotionEvent {
     /// docs](https://developer.android.com/ndk/reference/group/input#amotionevent_getflags)
     #[inline]
     pub fn flags(&self) -> MotionEventFlags {
-        unsafe { MotionEventFlags(ffi::AMotionEvent_getFlags(self.ptr.as_ptr()) as u32) }
+        MotionEventFlags(unsafe { ffi::AMotionEvent_getFlags(self.ptr.as_ptr()) } as u32)
     }
 
     /// Returns the offset in the x direction between the coordinates and the raw coordinates
@@ -657,6 +714,26 @@ impl MotionEvent {
     pub fn y_precision(&self) -> f32 {
         unsafe { ffi::AMotionEvent_getYPrecision(self.ptr.as_ptr()) }
     }
+
+    /// Get the action button for the motion event. Returns a valid action button when the event is
+    /// associated with a button press or button release action. For other actions the return value
+    /// is undefined.
+    #[cfg(feature = "api-level-33")]
+    #[doc(alias = "AMotionEvent_getActionButton")]
+    // TODO: Button enum to signify only one valid value?
+    pub fn action_button(&self) -> ButtonState {
+        ButtonState(unsafe { ffi::AMotionEvent_getActionButton(self.ptr.as_ptr()) } as u32)
+    }
+
+    /// Returns the classification for the current gesture. The classification may change as more
+    /// events become available for the same gesture.
+    #[cfg(feature = "api-level-33")]
+    #[doc(alias = "AMotionEvent_getClassification")]
+    pub fn classification(&self) -> MotionClassification {
+        u32::try_from(unsafe { ffi::AMotionEvent_getClassification(self.ptr.as_ptr()) })
+            .unwrap()
+            .into()
+    }
 }
 
 /// A view into the data of a specific pointer in a motion event.

ndk/src/hardware_buffer.rs

@@ -128,15 +128,14 @@ bitflags::bitflags! {
         #[doc(alias = "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE")]
         const GPU_MIPMAP_COMPLETE = ffi::AHardwareBuffer_UsageFlags::AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE.0;
 
-        // TODO: Only available in a newer NDK
-        // /// Usage: The buffer is used for front-buffer rendering. When front-buffering rendering
-        // /// is specified, different usages may adjust their behavior as a result. For example, when
-        // /// used as [`HardwareBufferFormat::GPU_COLOR_OUTPUT`] the buffer will behave similar to a
-        // /// single-buffered window. When used with [`HardwareBufferFormat::COMPOSER_OVERLAY`], the
-        // /// system will try to prioritize the buffer receiving an overlay plane & avoid caching it
-        // /// in intermediate composition buffers.
-        // #[doc(alias = "AHARDWAREBUFFER_USAGE_FRONT_BUFFER")]
-        // const USAGE_FRONT_BUFFER = ffi::AHardwareBuffer_UsageFlags::AHARDWAREBUFFER_USAGE_FRONT_BUFFER.0;
+        /// Usage: The buffer is used for front-buffer rendering. When front-buffering rendering
+        /// is specified, different usages may adjust their behavior as a result. For example, when
+        /// used as [`HardwareBufferFormat::GPU_COLOR_OUTPUT`] the buffer will behave similar to a
+        /// single-buffered window. When used with [`HardwareBufferFormat::COMPOSER_OVERLAY`], the
+        /// system will try to prioritize the buffer receiving an overlay plane & avoid caching it
+        /// in intermediate composition buffers.
+        #[doc(alias = "AHARDWAREBUFFER_USAGE_FRONT_BUFFER")]
+        const USAGE_FRONT_BUFFER = ffi::AHardwareBuffer_UsageFlags::AHARDWAREBUFFER_USAGE_FRONT_BUFFER.0;
 
         #[doc(alias = "AHARDWAREBUFFER_USAGE_VENDOR_0")]
         const VENDOR_0 = ffi::AHardwareBuffer_UsageFlags::AHARDWAREBUFFER_USAGE_VENDOR_0.0;

ndk/src/media/image_reader.rs

@@ -184,6 +184,13 @@ impl ImageReader {
         Ok(Self::from_ptr(inner))
     }
 
+    /// [`ImageReader`] constructor similar to [`ImageReader::new_with_usage()`] that takes two
+    /// additional parameters to build the format of the [`Image`]. All other parameters and the
+    /// return values are identical to those passed to [`ImageReader::new_with_usage()`].
+    ///
+    /// Instead of passing an [`ImageFormat`] parameter, this constructor accepts the combination
+    /// of [`HardwareBufferFormat`] and [`DataSpace`] for the format of the Image that the reader
+    /// will produce.
     #[cfg(feature = "api-level-34")]
     #[doc(alias = "AImageReader_newWithDataSpace")]
     pub fn new_with_data_space(
@@ -482,6 +489,7 @@ impl Image {
         std::mem::forget(self);
     }
 
+    /// Query the [`DataSpace`] of the input [`Image`].
     #[cfg(feature = "api-level-34")]
     #[doc(alias = "AImage_getDataSpace")]
     pub fn data_space(&self) -> Result<DataSpace> {