[device_settings] Rename factory reset button to "Erase User Data" to
better reflect the actual functionality.
SY-913 #done
TESTED: observe string change in device settings
Change-Id: I9270563d236ac71b2054c02d4588206cb0db1a1d
diff --git a/bin/device_settings/lib/src/widget.dart b/bin/device_settings/lib/src/widget.dart
index 121432f..1ac662b 100644
--- a/bin/device_settings/lib/src/widget.dart
+++ b/bin/device_settings/lib/src/widget.dart
@@ -61,8 +61,11 @@
scale: scale,
);
+ // The factory reset button is actually closer to "Erase User Data" in
+ // functionality. This string should be reverted back to "Factory Reset" once
+ // the implementation is closer to factory reset.
final factoryResetButton = SettingsButton(
- text: 'Factory Reset',
+ text: 'Erase User Data',
onTap: model.factoryReset,
scale: scale,
);
@@ -134,11 +137,11 @@
physics: BouncingScrollPhysics(),
padding: EdgeInsets.all(16.0),
child: SettingsSection(
- title: 'Factory Reset',
+ title: 'Erase User Data',
scale: scale,
child: Column(children: [
SettingsButton(
- text: 'Reset',
+ text: 'Erase',
scale: scale,
onTap: model.factoryReset,
),
diff --git a/lib/settings/lib/device_info.dart b/lib/settings/lib/device_info.dart
index 421e73e..c8cca9c 100644
--- a/lib/settings/lib/device_info.dart
+++ b/lib/settings/lib/device_info.dart
@@ -32,23 +32,6 @@
return null;
}
- /// Determines whether the factory reset flag has been set.
- ///
- /// Completes as true if the factory reset flag is present, false otherwise.
- static Future<bool> getFactoryResetFlag() async {
- final completer = Completer<bool>();
- final deviceSettingsManagerProxy = DeviceSettingsManagerProxy();
-
- connectToService(StartupContext.fromStartupInfo().environmentServices,
- deviceSettingsManagerProxy.ctrl);
- deviceSettingsManagerProxy.getInteger(_factoryResetKey,
- (int resetFlagValue, Status s) {
- deviceSettingsManagerProxy.ctrl.close();
- completer.complete(s == Status.ok && resetFlagValue > 0);
- });
- return completer.future;
- }
-
/// Sets a flag to determine whether the device should be reset to factory
/// settings or not.
///
