commit 102a1ecbde9d73c9241bbd85011135071ecb6552
author Sarah Chan <spqchan@google.com> Thu Feb 14 14:23:37 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Feb 15 01:37:20 2019 +0000
tree dc11d1ded33ba7c0cd775454f44aba3b2aa1c5e5
parent 357de5dc811eecf8e8549555ec9ea3d3b272ac84

[SetUi] Remove device settings from audio

To migrate audio.dart to fuchsia_media, dependencies to the
device settings must be removed since it's now deprecated.

Tests: Manual
Change-Id: Ib5bbcf1b88e7a4bfa5609bb0c0375860442073ae

public/lib/media/dart/audio.dart

diff --git a/public/lib/media/dart/audio.dart b/public/lib/media/dart/audio.dart
index 3297e60..a86d3b9 100644
--- a/public/lib/media/dart/audio.dart
+++ b/public/lib/media/dart/audio.dart
@@ -5,14 +5,12 @@
 import 'package:fidl_fuchsia_media/fidl_async.dart';
 import 'package:fuchsia_services/services.dart';
 import 'package:fuchsia_logger/logger.dart';
-import 'package:settings_protos/audio.pb.dart' as stored_audio;
-import 'package:settings_protos/setting_store.dart';
-import 'package:settings_protos/setting_store_factory.dart';
 
 /// Type for |Audio| update callbacks.
 typedef UpdateCallback = void Function();
 
 /// System audio.
+/// TODO: Persist audio changes in the device settings.
 class Audio {
   static const double _minLevelGainDb = -60.0;
   static const double _unityGainDb = 0.0;
@@ -29,8 +27,6 @@
   bool _systemAudioMuted = false;
   double _systemAudioPerceivedLevel = gainToLevel(_initialGainDb);
 
-  SettingStore<stored_audio.Audio> _store;
-
   /// Constructs an Audio object.
   Audio() {
     try {
@@ -40,21 +36,11 @@
     }
 
     _audioService.systemGainMuteChanged.forEach(_handleGainMuteChanged);
-
-    _store = new SettingStoreFactory().createAudioStore()
-      ..addlistener(_onSettingChanged)
-      ..connect().catchError(
-          (e) => log.severe('Unable to connect to setting store service', e));
   }
 
   /// Called when properties have changed significantly.
   UpdateCallback updateCallback;
 
-  void _onSettingChanged(stored_audio.Audio value) async {
-    await setSystemAudioGainDb(value.gain);
-    await setSystemAudioMuted(value.muted);
-  }
-
   /// Disposes this object.
   void dispose() {
     if (_audioService.ctrl.isClosed) {
@@ -106,16 +92,6 @@
 
     _systemAudioMuted = muted;
     await _audioService.setSystemMute(_systemAudioMuted);
-
-    await _persistUserSetting();
-  }
-
-  Future<void> _persistUserSetting() async {
-    final stored_audio.Audio audio = new stored_audio.Audio()
-      ..clear()
-      ..muted = _systemAudioMuted
-      ..gain = _systemAudioGainDb;
-    await _store.commit(audio);
   }
 
   /// Gets the perceived system-wide audio level in the range [0,1]. This value
@@ -129,7 +105,6 @@
     _systemAudioPerceivedLevel = value.clamp(0.0, 1.0);
     _systemAudioGainDb = levelToGain(_systemAudioPerceivedLevel);
 
-    await _persistUserSetting();
     await _audioService.setSystemGain(_systemAudioGainDb);
   }