[setui] Rename night_mode setting field.
This cl renames night_mode_status to night_mode_enabled, as per the
updated requirements in night_mode feature document.
Testing:
* Build: Passed
* fx run-test setui_client_interface_test
BUG=44128
BUG=44094
Change-Id: I58de37aa2a1275cfa840c735a43dff4a3fbcfea8
diff --git a/garnet/bin/setui_client/src/interface_test.rs b/garnet/bin/setui_client/src/interface_test.rs
index 6132505..9b445cc 100644
--- a/garnet/bin/setui_client/src/interface_test.rs
+++ b/garnet/bin/setui_client/src/interface_test.rs
@@ -180,7 +180,7 @@
println!(" client calls night mode watch");
validate_night_mode(None).await?;
- println!(" client calls set night_mode_status");
+ println!(" client calls set night_mode_enabled");
validate_night_mode(Some(true)).await?;
println!(" set() output");
@@ -638,12 +638,12 @@
Ok(())
}
-async fn validate_night_mode(expected_night_mode_status: Option<bool>) -> Result<(), Error> {
+async fn validate_night_mode(expected_night_mode_enabled: Option<bool>) -> Result<(), Error> {
let env = create_service!(
Services::NightMode, NightModeRequest::Set { settings, responder, } => {
- if let (Some(night_mode_status), Some(expected_night_mode_status_value)) =
- (settings.night_mode_status, expected_night_mode_status) {
- assert_eq!(night_mode_status, expected_night_mode_status_value);
+ if let (Some(night_mode_enabled), Some(expected_night_mode_enabled_value)) =
+ (settings.night_mode_enabled, expected_night_mode_enabled) {
+ assert_eq!(night_mode_enabled, expected_night_mode_enabled_value);
responder.send(&mut Ok(()))?;
} else {
panic!("Unexpected call to set");
@@ -651,7 +651,7 @@
},
NightModeRequest::Watch { responder } => {
responder.send(NightModeSettings {
- night_mode_status: Some(false),
+ night_mode_enabled: Some(false),
})?;
}
);
@@ -660,19 +660,19 @@
.connect_to_service::<NightModeMarker>()
.context("Failed to connect to night mode service")?;
- night_mode::command(night_mode_service, expected_night_mode_status).await?;
+ night_mode::command(night_mode_service, expected_night_mode_enabled).await?;
Ok(())
}
-async fn validate_night_mode_set_output(expected_night_mode_status: bool) -> Result<(), Error> {
+async fn validate_night_mode_set_output(expected_night_mode_enabled: bool) -> Result<(), Error> {
let env = create_service!(
Services::NightMode, NightModeRequest::Set { settings: _, responder, } => {
responder.send(&mut Ok(()))?;
},
NightModeRequest::Watch { responder } => {
responder.send(NightModeSettings {
- night_mode_status: Some(expected_night_mode_status),
+ night_mode_enabled: Some(expected_night_mode_enabled),
})?;
}
);
@@ -681,18 +681,18 @@
.connect_to_service::<NightModeMarker>()
.context("Failed to connect to night mode service")?;
- let output = night_mode::command(night_mode_service, Some(expected_night_mode_status)).await?;
+ let output = night_mode::command(night_mode_service, Some(expected_night_mode_enabled)).await?;
assert_eq!(
output,
- format!("Successfully set night_mode_status to {}", expected_night_mode_status)
+ format!("Successfully set night_mode_enabled to {}", expected_night_mode_enabled)
);
Ok(())
}
async fn validate_night_mode_watch_output(
- expected_night_mode_status: Option<bool>,
+ expected_night_mode_enabled: Option<bool>,
) -> Result<(), Error> {
let env = create_service!(
Services::NightMode, NightModeRequest::Set { settings: _, responder, } => {
@@ -700,7 +700,7 @@
},
NightModeRequest::Watch { responder } => {
responder.send(NightModeSettings {
- night_mode_status: expected_night_mode_status,
+ night_mode_enabled: expected_night_mode_enabled,
})?;
}
);
@@ -714,7 +714,7 @@
assert_eq!(
output,
- format!("{:#?}", NightModeSettings { night_mode_status: expected_night_mode_status })
+ format!("{:#?}", NightModeSettings { night_mode_enabled: expected_night_mode_enabled })
);
Ok(())
diff --git a/garnet/bin/setui_client/src/lib.rs b/garnet/bin/setui_client/src/lib.rs
index cb3b872..5e7ef5d 100644
--- a/garnet/bin/setui_client/src/lib.rs
+++ b/garnet/bin/setui_client/src/lib.rs
@@ -112,7 +112,7 @@
#[structopt(name = "night_mode")]
NightMode {
#[structopt(short, long)]
- night_mode_status: Option<bool>,
+ night_mode_enabled: Option<bool>,
},
#[structopt(name = "privacy")]
@@ -289,10 +289,10 @@
.await?;
println!("Intl: {}", output);
}
- SettingClient::NightMode { night_mode_status } => {
+ SettingClient::NightMode { night_mode_enabled } => {
let night_mode_service = connect_to_service::<fidl_fuchsia_settings::NightModeMarker>()
.context("Failed to connect to night mode service")?;
- let output = night_mode::command(night_mode_service, night_mode_status).await?;
+ let output = night_mode::command(night_mode_service, night_mode_enabled).await?;
println!("NightMode: {}", output);
}
SettingClient::Accessibility(accessibility_options) => {
diff --git a/garnet/bin/setui_client/src/night_mode.rs b/garnet/bin/setui_client/src/night_mode.rs
index affbd6d..f5e50d7 100644
--- a/garnet/bin/setui_client/src/night_mode.rs
+++ b/garnet/bin/setui_client/src/night_mode.rs
@@ -6,16 +6,16 @@
pub async fn command(
proxy: NightModeProxy,
- night_mode_status: Option<bool>,
+ night_mode_enabled: Option<bool>,
) -> Result<String, Error> {
- if let Some(night_mode_status_value) = night_mode_status {
+ if let Some(night_mode_enabled_value) = night_mode_enabled {
let mut settings = NightModeSettings::empty();
- settings.night_mode_status = Some(night_mode_status_value);
+ settings.night_mode_enabled = Some(night_mode_enabled_value);
let mutate_result = proxy.set(settings).await?;
match mutate_result {
Ok(_) => {
- Ok(format!("Successfully set night_mode_status to {}", night_mode_status_value))
+ Ok(format!("Successfully set night_mode_enabled to {}", night_mode_enabled_value))
}
Err(err) => Ok(format!("{:#?}", err)),
}
diff --git a/sdk/fidl/fuchsia.settings/fuchsia.settings.api b/sdk/fidl/fuchsia.settings/fuchsia.settings.api
index 22e91d0..9fb347d 100644
--- a/sdk/fidl/fuchsia.settings/fuchsia.settings.api
+++ b/sdk/fidl/fuchsia.settings/fuchsia.settings.api
@@ -5,7 +5,7 @@
"fidl/fuchsia.settings/display.fidl": "2c538a8a80273b89c18b1cefd272552b",
"fidl/fuchsia.settings/do_not_disturb.fidl": "cf2a2a00a6905d3a796693793547478b",
"fidl/fuchsia.settings/intl.fidl": "2981c300e3fcdb9ee2460ad4bd504e90",
- "fidl/fuchsia.settings/night_mode.fidl": "c811d4ea4ba4ce52d303f95791a852cf",
+ "fidl/fuchsia.settings/night_mode.fidl": "cf992aed829fbee3c5f973997237e3aa",
"fidl/fuchsia.settings/privacy.fidl": "18c889d29392b901bcdd9d1f5075d190",
"fidl/fuchsia.settings/settings.fidl": "8005babad1700cbf2eb0359f5e6ab6e4",
"fidl/fuchsia.settings/setup.fidl": "4930a5baeb2ce45c3aec1a6669ebb86e",
diff --git a/sdk/fidl/fuchsia.settings/night_mode.fidl b/sdk/fidl/fuchsia.settings/night_mode.fidl
index 5ec3f28..dae524c 100644
--- a/sdk/fidl/fuchsia.settings/night_mode.fidl
+++ b/sdk/fidl/fuchsia.settings/night_mode.fidl
@@ -24,6 +24,6 @@
/// Settings related to Night mode.
table NightModeSettings {
- /// If true, the device is in Night mode.
- 1: bool night_mode_status;
+ /// If true, the device/user have opted in for NightMode routine.
+ 1: bool night_mode_enabled;
};
