Use injection in ProgramView

PiperOrigin-RevId: 261155338
Change-Id: I93a71b7707d0c14934007d2c5f810dc129678428

2 files changed, 22 insertions, 5 deletions

diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java
index e550700f..141ce822 100644
--- a/src/com/android/tv/MainActivity.java
+++ b/src/com/android/tv/MainActivity.java
@@ -111,6 +111,7 @@ import com.android.tv.dvr.recorder.ConflictChecker;
 import com.android.tv.dvr.ui.DvrStopRecordingFragment;
 import com.android.tv.dvr.ui.DvrUiHelper;
 import com.android.tv.features.TvFeatures;
+import com.android.tv.guide.ProgramItemView;
 import com.android.tv.menu.Menu;
 import com.android.tv.onboarding.OnboardingActivity;
 import com.android.tv.parental.ContentRatingsManager;
@@ -159,7 +160,10 @@ import com.android.tv.util.images.ImageCache;
 import com.google.common.base.Optional;
 
 import dagger.android.AndroidInjection;
+import dagger.android.AndroidInjector;
 import dagger.android.ContributesAndroidInjector;
+import dagger.android.DispatchingAndroidInjector;
+import dagger.android.HasAndroidInjector;
 
 import com.android.tv.common.flags.BackendKnobsFlags;
 import com.android.tv.common.flags.LegacyFlags;
@@ -184,7 +188,8 @@ public class MainActivity extends Activity
         implements OnActionClickListener,
                 OnPinCheckedListener,
                 ChannelChanger,
-                HasSingletons<MySingletons> {
+                HasSingletons<MySingletons>,
+                HasAndroidInjector {
     private static final String TAG = "MainActivity";
     private static final boolean DEBUG = false;
     private AudioCapabilitiesReceiver mAudioCapabilitiesReceiver;
@@ -275,6 +280,7 @@ public class MainActivity extends Activity
     }
 
     private final MySingletonsImpl mMySingletons = new MySingletonsImpl();
+    @Inject DispatchingAndroidInjector<Object> mAndroidInjector;
     @Inject @DbExecutor Executor mDbExecutor;
 
     private AccessibilityManager mAccessibilityManager;
@@ -2794,6 +2800,11 @@ public class MainActivity extends Activity
         }
     }
 
+    @Override
+    public AndroidInjector<Object> androidInjector() {
+        return mAndroidInjector;
+    }
+
     private static class MainActivityHandler extends WeakHandler<MainActivity> {
         MainActivityHandler(MainActivity mainActivity) {
             super(mainActivity);
@@ -3001,5 +3012,8 @@ public class MainActivity extends Activity
 
         @ContributesAndroidInjector
         abstract RatingsFragment contributesRatingsFragment();
+
+        @ContributesAndroidInjector
+        abstract ProgramItemView contributesProgramItemView();
     }
 }
diff --git a/src/com/android/tv/guide/ProgramItemView.java b/src/com/android/tv/guide/ProgramItemView.java
index b45e1ffe..65b76412 100644
--- a/src/com/android/tv/guide/ProgramItemView.java
+++ b/src/com/android/tv/guide/ProgramItemView.java
@@ -52,9 +52,13 @@ 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";
 
@@ -76,8 +80,8 @@ public class ProgramItemView extends TextView {
     private static TextAppearanceSpan sGrayedOutEpisodeTitleStyle;
 
     private final DvrManager mDvrManager;
-    private final Clock mClock;
-    private final ChannelDataManager mChannelDataManager;
+    @Inject Clock mClock;
+    @Inject ChannelDataManager mChannelDataManager;
     private ProgramGuide mProgramGuide;
     private TableEntry mTableEntry;
     private int mMaxWidthForRipple;
@@ -205,12 +209,11 @@ 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() {