1 files changed, 38 insertions, 10 deletions

diff --git a/src/com/android/tv/menu/MenuUpdater.java b/src/com/android/tv/menu/MenuUpdater.java
index 075b299e..18416c85 100644
--- a/src/com/android/tv/menu/MenuUpdater.java
+++ b/src/com/android/tv/menu/MenuUpdater.java
@@ -16,11 +16,14 @@
 
 package com.android.tv.menu;
 
-import android.content.Context;
 import android.support.annotation.Nullable;
 
 import com.android.tv.ChannelTuner;
+import com.android.tv.TvOptionsManager;
+import com.android.tv.TvOptionsManager.OptionChangedListener;
+import com.android.tv.TvOptionsManager.OptionType;
 import com.android.tv.data.Channel;
+import com.android.tv.menu.MenuRowFactory.TvOptionsRow;
 import com.android.tv.ui.TunableTvView;
 import com.android.tv.ui.TunableTvView.OnScreenBlockingChangedListener;
 
@@ -30,10 +33,10 @@ import com.android.tv.ui.TunableTvView.OnScreenBlockingChangedListener;
  * <p>As the menu is updated when it shows up, this class handles only the dynamic updates.
  */
 public class MenuUpdater {
-    // Can be null for testing.
-    @Nullable
-    private final TunableTvView mTvView;
     private final Menu mMenu;
+    // Can be null for testing.
+    @Nullable private final TunableTvView mTvView;
+    @Nullable private final TvOptionsManager mOptionsManager;
     private ChannelTuner mChannelTuner;
 
     private final ChannelTuner.Listener mChannelTunerListener = new ChannelTuner.Listener() {
@@ -42,7 +45,7 @@ public class MenuUpdater {
 
         @Override
         public void onBrowsableChannelListChanged() {
-            mMenu.update();
+            mMenu.update(ChannelsRow.ID);
         }
 
         @Override
@@ -53,10 +56,17 @@ public class MenuUpdater {
             mMenu.update(ChannelsRow.ID);
         }
     };
+    private final OptionChangedListener mOptionChangeListener = new OptionChangedListener() {
+        @Override
+        public void onOptionChanged(@OptionType int optionType, String newString) {
+            mMenu.update(TvOptionsRow.ID);
+        }
+    };
 
-    public MenuUpdater(Context context, TunableTvView tvView, Menu menu) {
-        mTvView = tvView;
+    public MenuUpdater(Menu menu, TunableTvView tvView, TvOptionsManager optionsManager) {
         mMenu = menu;
+        mTvView = tvView;
+        mOptionsManager = optionsManager;
         if (mTvView != null) {
             mTvView.setOnScreenBlockedListener(new OnScreenBlockingChangedListener() {
                     @Override
@@ -65,11 +75,18 @@ public class MenuUpdater {
                     }
             });
         }
+        if (mOptionsManager != null) {
+            mOptionsManager.setOptionChangedListener(TvOptionsManager.OPTION_CLOSED_CAPTIONS,
+                    mOptionChangeListener);
+            mOptionsManager.setOptionChangedListener(TvOptionsManager.OPTION_DISPLAY_MODE,
+                    mOptionChangeListener);
+            mOptionsManager.setOptionChangedListener(TvOptionsManager.OPTION_MULTI_AUDIO,
+                    mOptionChangeListener);
+        }
     }
 
     /**
-     * Sets the instance of {@link ChannelTuner}. Call this method when the channel tuner is ready
-     * or not available any more.
+     * Sets the instance of {@link ChannelTuner}. Call this method when the channel tuner is ready.
      */
     public void setChannelTuner(ChannelTuner channelTuner) {
         if (mChannelTuner != null) {
@@ -79,7 +96,13 @@ public class MenuUpdater {
         if (mChannelTuner != null) {
             mChannelTuner.addListener(mChannelTunerListener);
         }
-        mMenu.update();
+    }
+
+    /**
+     * Called when the stream information changes.
+     */
+    public void onStreamInfoChanged() {
+        mMenu.update(TvOptionsRow.ID);
     }
 
     /**
@@ -92,5 +115,10 @@ public class MenuUpdater {
         if (mTvView != null) {
             mTvView.setOnScreenBlockedListener(null);
         }
+        if (mOptionsManager != null) {
+            mOptionsManager.setOptionChangedListener(TvOptionsManager.OPTION_CLOSED_CAPTIONS, null);
+            mOptionsManager.setOptionChangedListener(TvOptionsManager.OPTION_DISPLAY_MODE, null);
+            mOptionsManager.setOptionChangedListener(TvOptionsManager.OPTION_MULTI_AUDIO, null);
+        }
     }
 }