[assembly] Synchronize InputDeviceType

Assembly config_schema uses the input-device-constants enum to reduce an
extra copy of this enum.

The bazel rules are updated to reflect all the right options, and a
IFTTT is added.

Bug: 346413132
Change-Id: Ie860f1d1b1546dc6e52468909c81b9d8c54d3d11
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1179389
Reviewed-by: Filip Filmar <[email protected]>
Fuchsia-Auto-Submit: Aidan Wolter <[email protected]>
Reviewed-by: Jiaming Li <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>

Author: aidanwolter3

build/bazel_sdk/bazel_rules_fuchsia/fuchsia/private/assembly/fuchsia_product_configuration.bzl

@@ -34,6 +34,7 @@ BUILD_TYPES = struct(
 INPUT_DEVICE_TYPE = struct(
     BUTTON = "button",
     KEYBOARD = "keyboard",
+    LIGHT_SENSOR = "lightsensor",
     MOUSE = "mouse",
     TOUCHSCREEN = "touchscreen",
 )

src/lib/assembly/config_schema/src/platform_config/ui_config.rs

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 use assembly_file_relative_path::{FileRelativePathBuf, SupportsFileRelativePaths};
-use input_device_constants::InputDeviceType as PlatformInputDeviceType;
+use input_device_constants::InputDeviceType;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -85,32 +85,6 @@ impl Default for PlatformUiConfig {
     }
 }
 
-// LINT.IfChange
-/// Options for input devices that may be supported.
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
-#[serde(rename_all = "lowercase", deny_unknown_fields)]
-pub enum InputDeviceType {
-    Button,
-    Keyboard,
-    LightSensor,
-    Mouse,
-    Touchscreen,
-}
-
-// This impl verifies that the platform and assembly enums are kept in sync.
-impl From<InputDeviceType> for PlatformInputDeviceType {
-    fn from(src: InputDeviceType) -> PlatformInputDeviceType {
-        match src {
-            InputDeviceType::Button => PlatformInputDeviceType::ConsumerControls,
-            InputDeviceType::Keyboard => PlatformInputDeviceType::Keyboard,
-            InputDeviceType::LightSensor => PlatformInputDeviceType::LightSensor,
-            InputDeviceType::Mouse => PlatformInputDeviceType::Mouse,
-            InputDeviceType::Touchscreen => PlatformInputDeviceType::Touch,
-        }
-    }
-}
-// LINT.ThenChange(/src/ui/lib/input-device-constants/src/lib.rs)
-
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq, JsonSchema)]
 #[serde(rename_all = "lowercase", deny_unknown_fields)]
 pub enum ViewingDistance {

src/ui/lib/input-device-constants/BUILD.gn

@@ -17,7 +17,11 @@ rustc_library("lib") {
   name = "input_device_constants"
   with_unit_tests = true
   edition = "2021"
-  deps = [ "//third_party/rust_crates:tracing" ]
+  deps = [
+    "//third_party/rust_crates:schemars",
+    "//third_party/rust_crates:serde",
+    "//third_party/rust_crates:tracing",
+  ]
   sources = [ "src/lib.rs" ]
 }
 

src/ui/lib/input-device-constants/src/lib.rs

@@ -2,35 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/// Generic types of supported input devices.
-#[derive(Debug, Clone, Copy, Eq, Hash, PartialEq)]
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
 // LINT.IfChange
+/// Generic types of supported input devices.
+#[derive(Debug, Clone, Copy, Eq, Hash, PartialEq, Deserialize, Serialize, JsonSchema)]
+#[serde(rename_all = "lowercase")]
 pub enum InputDeviceType {
     Keyboard,
     LightSensor,
+    #[serde(rename = "button")]
     ConsumerControls,
     Mouse,
+    #[serde(rename = "touchscreen")]
     Touch,
 }
-// LINT.ThenChange(/src/lib/assembly/config_schema/src/product_config.rs)
+// LINT.ThenChange(/build/bazel_sdk/bazel_rules_fuchsia/fuchsia/private/assembly/fuchsia_product_configuration.bzl)
 
 impl InputDeviceType {
-    /// Parses an `InputDeviceType` string that has been serialized from
-    /// `src/lib/assembly/config_schema/src/product_config.rs`: `InputDeviceType`, which has
-    /// slightly different names.
-    ///
-    /// If a device string isn't recognized, returns `None`.
-    pub fn try_from_assembly_config_entry(device: impl AsRef<str>) -> Option<Self> {
-        match device.as_ref() {
-            "button" => Some(Self::ConsumerControls),
-            "keyboard" => Some(Self::Keyboard),
-            "lightsensor" => Some(Self::LightSensor),
-            "mouse" => Some(Self::Mouse),
-            "touchscreen" => Some(Self::Touch),
-            _ => None,
-        }
-    }
-
     /// Parses a list of supported `InputDeviceType`s from a structured configuration
     /// `supported_input_devices` list. Unknown device types are logged and skipped.
     pub fn list_from_structured_config_list<'a, V, T>(list: V) -> Vec<Self>
@@ -39,9 +29,13 @@ impl InputDeviceType {
         T: AsRef<str> + 'a,
     {
         list.into_iter()
-            .filter_map(|device| match Self::try_from_assembly_config_entry(device) {
-                Some(d) => Some(d),
-                None => {
+            .filter_map(|device| match device.as_ref() {
+                "button" => Some(InputDeviceType::ConsumerControls),
+                "keyboard" => Some(InputDeviceType::Keyboard),
+                "lightsensor" => Some(InputDeviceType::LightSensor),
+                "mouse" => Some(InputDeviceType::Mouse),
+                "touchscreen" => Some(InputDeviceType::Touch),
+                _ => {
                     tracing::warn!(
                         "Ignoring unsupported device configuration: {}",
                         device.as_ref()