1 files changed, 5 insertions, 17 deletions
diff --git a/src/com/android/tv/guide/ProgramItemView.java b/src/com/android/tv/guide/ProgramItemView.java
index 5ec293f7..a46beab7 100644
--- a/src/com/android/tv/guide/ProgramItemView.java
+++ b/src/com/android/tv/guide/ProgramItemView.java
@@ -23,7 +23,6 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.StateListDrawable;
-import android.os.Build;
 import android.os.Handler;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -35,7 +34,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.android.tv.MainActivity;
 import com.android.tv.R;
 import com.android.tv.TvSingletons;
@@ -43,22 +41,17 @@ import com.android.tv.analytics.Tracker;
 import com.android.tv.common.feature.CommonFeatures;
 import com.android.tv.common.util.Clock;
 import com.android.tv.data.ChannelDataManager;
+import com.android.tv.data.Program;
 import com.android.tv.data.api.Channel;
-import com.android.tv.data.api.Program;
 import com.android.tv.dvr.DvrManager;
 import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.dvr.ui.DvrUiHelper;
 import com.android.tv.guide.ProgramManager.TableEntry;
 import com.android.tv.util.ToastUtils;
 import com.android.tv.util.Utils;
-
-import dagger.android.HasAndroidInjector;
-
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
-
 public class ProgramItemView extends TextView {
     private static final String TAG = "ProgramItemView";
 
@@ -80,8 +73,8 @@ public class ProgramItemView extends TextView {
     private static TextAppearanceSpan sGrayedOutEpisodeTitleStyle;
 
     private final DvrManager mDvrManager;
-    @Inject Clock mClock;
-    @Inject ChannelDataManager mChannelDataManager;
+    private final Clock mClock;
+    private final ChannelDataManager mChannelDataManager;
     private ProgramGuide mProgramGuide;
     private TableEntry mTableEntry;
     private int mMaxWidthForRipple;
@@ -209,11 +202,12 @@ public class ProgramItemView extends TextView {
 
     public ProgramItemView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        ((HasAndroidInjector) context).androidInjector().inject(this);
         setOnClickListener(ON_CLICKED);
         setOnFocusChangeListener(ON_FOCUS_CHANGED);
         TvSingletons singletons = TvSingletons.getSingletons(getContext());
         mDvrManager = singletons.getDvrManager();
+        mChannelDataManager = singletons.getChannelDataManager();
+        mClock = singletons.getClock();
     }
 
     private void initIfNeeded() {
@@ -536,9 +530,6 @@ public class ProgramItemView extends TextView {
     }
 
     private static int getStateCount(StateListDrawable stateListDrawable) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            return stateListDrawable.getStateCount();
-        }
         try {
             Object stateCount =
                     StateListDrawable.class
@@ -555,9 +546,6 @@ public class ProgramItemView extends TextView {
     }
 
     private static Drawable getStateDrawable(StateListDrawable stateListDrawable, int index) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            return stateListDrawable.getStateDrawable(index);
-        }
         try {
             Object drawable =
                     StateListDrawable.class