Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92

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);
+        }
     }
 }