1 files changed, 10 insertions, 15 deletions
diff --git a/src/com/android/tv/guide/ProgramGuide.java b/src/com/android/tv/guide/ProgramGuide.java
index 8ae61e8a..bc1b11b6 100644
--- a/src/com/android/tv/guide/ProgramGuide.java
+++ b/src/com/android/tv/guide/ProgramGuide.java
@@ -32,7 +32,10 @@ import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
+import android.support.v17.leanback.widget.OnChildSelectedListener;
+import android.support.v17.leanback.widget.SearchOrbView;
+import android.support.v17.leanback.widget.VerticalGridView;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.View.MeasureSpec;
@@ -41,11 +44,6 @@ import android.view.ViewGroup.LayoutParams;
 import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
-
-import androidx.leanback.widget.OnChildSelectedListener;
-import androidx.leanback.widget.SearchOrbView;
-import androidx.leanback.widget.VerticalGridView;
-
 import com.android.tv.ChannelTuner;
 import com.android.tv.MainActivity;
 import com.android.tv.R;
@@ -67,9 +65,7 @@ import com.android.tv.ui.ViewUtils;
 import com.android.tv.ui.hideable.AutoHideScheduler;
 import com.android.tv.util.TvInputManagerHelper;
 import com.android.tv.util.Utils;
-
-import com.android.tv.common.flags.UiFlags;
-
+import com.android.tv.common.flags.BackendKnobsFlags;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -116,7 +112,6 @@ public class ProgramGuide
     private final int mAnimationDuration;
     private final int mDetailPadding;
     private final SearchOrbView mSearchOrb;
-    private final UiFlags mUiFlags;
     private int mCurrentTimeIndicatorWidth;
 
     private final View mContainer;
@@ -190,14 +185,15 @@ public class ProgramGuide
         mActivity = activity;
         TvSingletons singletons = TvSingletons.getSingletons(mActivity);
         mPerformanceMonitor = singletons.getPerformanceMonitor();
-        mUiFlags = singletons.getUiFlags();
+        BackendKnobsFlags backendKnobsFlags = singletons.getBackendKnobs();
         mProgramManager =
                 new ProgramManager(
                         tvInputManagerHelper,
                         channelDataManager,
                         programDataManager,
                         dvrDataManager,
-                        dvrScheduleManager);
+                        dvrScheduleManager,
+                        backendKnobsFlags);
         mChannelTuner = channelTuner;
         mTracker = tracker;
         mPreShowRunnable = preShowRunnable;
@@ -265,7 +261,7 @@ public class ProgramGuide
                         }
                     });
             mSidePanelGridView.setOnChildSelectedListener(
-                    new androidx.leanback.widget.OnChildSelectedListener() {
+                    new android.support.v17.leanback.widget.OnChildSelectedListener() {
                         @Override
                         public void onChildSelected(ViewGroup viewGroup, View view, int i, long l) {
                             mSearchOrb.animate().alpha(i == 0 ? 1.0f : 0.0f);
@@ -286,8 +282,7 @@ public class ProgramGuide
                         res.getInteger(R.integer.max_recycled_view_pool_epg_header_row_item));
         mTimelineRow.setAdapter(mTimeListAdapter);
 
-        ProgramTableAdapter programTableAdapter =
-                new ProgramTableAdapter(mActivity, this, mUiFlags);
+        ProgramTableAdapter programTableAdapter = new ProgramTableAdapter(mActivity, this);
         programTableAdapter.registerAdapterDataObserver(
                 new RecyclerView.AdapterDataObserver() {
                     @Override