Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1d am: 0550a7221b

am: c11f019e2f

Change-Id: I4645f478a402648d74c1d103f87959cd71c57ae5

1 files changed, 2 insertions, 48 deletions

diff --git a/src/com/android/tv/menu/OptionsRowAdapter.java b/src/com/android/tv/menu/OptionsRowAdapter.java
index 93bd0a4d..dd6194a1 100644
--- a/src/com/android/tv/menu/OptionsRowAdapter.java
+++ b/src/com/android/tv/menu/OptionsRowAdapter.java
@@ -21,8 +21,6 @@ import android.view.View;
 
 import com.android.tv.R;
 import com.android.tv.TvApplication;
-import com.android.tv.TvOptionsManager;
-import com.android.tv.TvOptionsManager.OptionChangedListener;
 import com.android.tv.analytics.Tracker;
 
 import java.util.List;
@@ -66,12 +64,9 @@ public abstract class OptionsRowAdapter extends ItemListRowView.ItemListAdapter<
     public void update() {
         if (mActionList == null) {
             mActionList = createActions();
-            updateActions();
             setItemList(mActionList);
         } else {
-            if (updateActions()) {
-                setItemList(mActionList);
-            }
+            updateActions();
         }
     }
 
@@ -81,7 +76,7 @@ public abstract class OptionsRowAdapter extends ItemListRowView.ItemListAdapter<
     }
 
     protected abstract List<MenuAction> createActions();
-    protected abstract boolean updateActions();
+    protected abstract void updateActions();
     protected abstract void executeAction(int type);
 
     /**
@@ -93,37 +88,6 @@ public abstract class OptionsRowAdapter extends ItemListRowView.ItemListAdapter<
         return mActionList.get(position);
     }
 
-    /**
-     * Sets the action at the given position.
-     * Note that action at the position may differ from returned by {@link #createActions}.
-     * See {@link CustomizableOptionsRowAdapter}
-     */
-    protected void setAction(int position, MenuAction action) {
-        mActionList.set(position, action);
-    }
-
-    /**
-     * Adds an action to the given position.
-     * Note that action at the position may differ from returned by {@link #createActions}.
-     * See {@link CustomizableOptionsRowAdapter}
-     */
-    protected void addAction(int position, MenuAction action) {
-        mActionList.add(position, action);
-    }
-
-    /**
-     * Removes an action at the given position.
-     * Note that action at the position may differ from returned by {@link #createActions}.
-     * See {@link CustomizableOptionsRowAdapter}
-     */
-    protected void removeAction(int position) {
-        mActionList.remove(position);
-    }
-
-    protected int getActionSize() {
-        return mActionList.size();
-    }
-
     @Override
     public void onBindViewHolder(MyViewHolder viewHolder, int position) {
         super.onBindViewHolder(viewHolder, position);
@@ -139,14 +103,4 @@ public abstract class OptionsRowAdapter extends ItemListRowView.ItemListAdapter<
         // be preserved.
         return mActionList.get(position).getType();
     }
-
-    protected void setOptionChangedListener(final MenuAction action) {
-        TvOptionsManager om = getMainActivity().getTvOptionsManager();
-        om.setOptionChangedListener(action.getType(), new OptionChangedListener() {
-            @Override
-            public void onOptionChanged(String newOption) {
-                setItemList(mActionList);
-            }
-        });
-    }
 }