1 files changed, 32 insertions, 36 deletions

diff --git a/src/com/android/tv/menu/MenuRowFactory.java b/src/com/android/tv/menu/MenuRowFactory.java
index 570cfb8f..048d725d 100644
--- a/src/com/android/tv/menu/MenuRowFactory.java
+++ b/src/com/android/tv/menu/MenuRowFactory.java
@@ -19,80 +19,76 @@ package com.android.tv.menu;
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-
 import com.android.tv.MainActivity;
 import com.android.tv.R;
-import com.android.tv.customization.CustomAction;
-import com.android.tv.customization.TvCustomizationManager;
+import com.android.tv.common.customization.CustomAction;
+import com.android.tv.common.customization.CustomizationManager;
 import com.android.tv.ui.TunableTvView;
-
 import java.util.List;
 
-/**
- * A factory class to create menu rows.
- */
+/** A factory class to create menu rows. */
 public class MenuRowFactory {
     private final MainActivity mMainActivity;
     private final TunableTvView mTvView;
-    private final TvCustomizationManager mTvCustomizationManager;
+    private final CustomizationManager mCustomizationManager;
 
-    /**
-     * A constructor.
-     */
+    /** A constructor. */
     public MenuRowFactory(MainActivity mainActivity, TunableTvView tvView) {
         mMainActivity = mainActivity;
         mTvView = tvView;
-        mTvCustomizationManager = new TvCustomizationManager(mainActivity);
-        mTvCustomizationManager.initialize();
+        mCustomizationManager = new CustomizationManager(mainActivity);
+        mCustomizationManager.initialize();
     }
 
-    /**
-     * Creates an object corresponding to the given {@code key}.
-     */
+    /** Creates an object corresponding to the given {@code key}. */
     @Nullable
     public MenuRow createMenuRow(Menu menu, Class<?> key) {
         if (PlayControlsRow.class.equals(key)) {
-            return new PlayControlsRow(mMainActivity, mTvView, menu,
-                    mMainActivity.getTimeShiftManager());
+            return new PlayControlsRow(
+                    mMainActivity, mTvView, menu, mMainActivity.getTimeShiftManager());
         } else if (ChannelsRow.class.equals(key)) {
             return new ChannelsRow(mMainActivity, menu, mMainActivity.getProgramDataManager());
         } else if (PartnerRow.class.equals(key)) {
-            List<CustomAction> customActions = mTvCustomizationManager.getCustomActions(
-                    TvCustomizationManager.ID_PARTNER_ROW);
-            String title = mTvCustomizationManager.getPartnerRowTitle();
+            List<CustomAction> customActions =
+                    mCustomizationManager.getCustomActions(CustomizationManager.ID_PARTNER_ROW);
+            String title = mCustomizationManager.getPartnerRowTitle();
             if (customActions != null && !TextUtils.isEmpty(title)) {
                 return new PartnerRow(mMainActivity, menu, title, customActions);
             }
             return null;
         } else if (TvOptionsRow.class.equals(key)) {
-            return new TvOptionsRow(mMainActivity, menu, mTvCustomizationManager
-                    .getCustomActions(TvCustomizationManager.ID_OPTIONS_ROW));
+            return new TvOptionsRow(
+                    mMainActivity,
+                    menu,
+                    mCustomizationManager.getCustomActions(CustomizationManager.ID_OPTIONS_ROW));
         }
         return null;
     }
 
-    /**
-     * A menu row which represents the TV options row.
-     */
+    /** A menu row which represents the TV options row. */
     public static class TvOptionsRow extends ItemListRow {
-        /**
-         * The ID of the row.
-         */
+        /** The ID of the row. */
         public static final String ID = TvOptionsRow.class.getName();
 
         private TvOptionsRow(Context context, Menu menu, List<CustomAction> customActions) {
-            super(context, menu, R.string.menu_title_options, R.dimen.action_card_height,
+            super(
+                    context,
+                    menu,
+                    R.string.menu_title_options,
+                    R.dimen.action_card_height,
                     new TvOptionsRowAdapter(context, customActions));
         }
     }
 
-    /**
-     * A menu row which represents the partner row.
-     */
+    /** A menu row which represents the partner row. */
     public static class PartnerRow extends ItemListRow {
-        private PartnerRow(Context context, Menu menu, String title,
-                           List<CustomAction> customActions) {
-            super(context, menu, title, R.dimen.action_card_height,
+        private PartnerRow(
+                Context context, Menu menu, String title, List<CustomAction> customActions) {
+            super(
+                    context,
+                    menu,
+                    title,
+                    R.dimen.action_card_height,
                     new PartnerOptionsRowAdapter(context, customActions));
         }
     }