1 files changed, 24 insertions, 20 deletions

diff --git a/src/com/android/tv/dvr/ui/browse/SeriesRecordingPresenter.java b/src/com/android/tv/dvr/ui/browse/SeriesRecordingPresenter.java
index e508259d..14f9dceb 100644
--- a/src/com/android/tv/dvr/ui/browse/SeriesRecordingPresenter.java
+++ b/src/com/android/tv/dvr/ui/browse/SeriesRecordingPresenter.java
@@ -19,10 +19,8 @@ package com.android.tv.dvr.ui.browse;
 import android.content.Context;
 import android.media.tv.TvInputManager;
 import android.text.TextUtils;
-
-import com.android.tv.ApplicationSingletons;
 import com.android.tv.R;
-import com.android.tv.TvApplication;
+import com.android.tv.TvSingletons;
 import com.android.tv.dvr.DvrDataManager;
 import com.android.tv.dvr.DvrDataManager.RecordedProgramListener;
 import com.android.tv.dvr.DvrDataManager.ScheduledRecordingListener;
@@ -32,27 +30,29 @@ import com.android.tv.dvr.DvrWatchedPositionManager.WatchedPositionChangedListen
 import com.android.tv.dvr.data.RecordedProgram;
 import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.dvr.data.SeriesRecording;
-
 import java.util.List;
 
-/**
- * Presents a {@link SeriesRecording} in {@link DvrBrowseFragment}.
- */
+/** Presents a {@link SeriesRecording} in {@link DvrBrowseFragment}. */
 class SeriesRecordingPresenter extends DvrItemPresenter<SeriesRecording> {
     private final DvrDataManager mDvrDataManager;
     private final DvrManager mDvrManager;
     private final DvrWatchedPositionManager mWatchedPositionManager;
 
-    private final class SeriesRecordingViewHolder extends DvrItemViewHolder implements
-            WatchedPositionChangedListener, ScheduledRecordingListener, RecordedProgramListener {
+    private final class SeriesRecordingViewHolder extends DvrItemViewHolder
+            implements WatchedPositionChangedListener,
+                    ScheduledRecordingListener,
+                    RecordedProgramListener {
         private SeriesRecording mSeriesRecording;
         private RecordingCardView mCardView;
         private DvrDataManager mDvrDataManager;
         private DvrManager mDvrManager;
         private DvrWatchedPositionManager mWatchedPositionManager;
 
-        SeriesRecordingViewHolder(RecordingCardView view, DvrDataManager dvrDataManager,
-                DvrManager dvrManager, DvrWatchedPositionManager watchedPositionManager) {
+        SeriesRecordingViewHolder(
+                RecordingCardView view,
+                DvrDataManager dvrDataManager,
+                DvrManager dvrManager,
+                DvrWatchedPositionManager watchedPositionManager) {
             super(view);
             mCardView = view;
             mDvrDataManager = dvrDataManager;
@@ -92,8 +92,8 @@ class SeriesRecordingPresenter extends DvrItemPresenter<SeriesRecording> {
         public void onRecordedProgramsAdded(RecordedProgram... recordedPrograms) {
             boolean needToUpdateCardView = false;
             for (RecordedProgram recordedProgram : recordedPrograms) {
-                if (TextUtils.equals(recordedProgram.getSeriesId(),
-                        mSeriesRecording.getSeriesId())) {
+                if (TextUtils.equals(
+                        recordedProgram.getSeriesId(), mSeriesRecording.getSeriesId())) {
                     mDvrDataManager.removeScheduledRecordingListener(this);
                     mWatchedPositionManager.addListener(this, recordedProgram.getId());
                     needToUpdateCardView = true;
@@ -108,8 +108,8 @@ class SeriesRecordingPresenter extends DvrItemPresenter<SeriesRecording> {
         public void onRecordedProgramsRemoved(RecordedProgram... recordedPrograms) {
             boolean needToUpdateCardView = false;
             for (RecordedProgram recordedProgram : recordedPrograms) {
-                if (TextUtils.equals(recordedProgram.getSeriesId(),
-                        mSeriesRecording.getSeriesId())) {
+                if (TextUtils.equals(
+                        recordedProgram.getSeriesId(), mSeriesRecording.getSeriesId())) {
                     if (mWatchedPositionManager.getWatchedPosition(recordedProgram.getId())
                             == TvInputManager.TIME_SHIFT_INVALID_TIME) {
                         mWatchedPositionManager.removeListener(this, recordedProgram.getId());
@@ -177,14 +177,15 @@ class SeriesRecordingPresenter extends DvrItemPresenter<SeriesRecording> {
                     quantityStringID = R.plurals.dvr_count_new_recordings;
                 }
             }
-            mCardView.setContent(mCardView.getResources()
-                    .getQuantityString(quantityStringID, count, count), null);
+            mCardView.setContent(
+                    mCardView.getResources().getQuantityString(quantityStringID, count, count),
+                    null);
         }
     }
 
     public SeriesRecordingPresenter(Context context) {
         super(context);
-        ApplicationSingletons singletons = TvApplication.getSingletons(context);
+        TvSingletons singletons = TvSingletons.getSingletons(context);
         mDvrDataManager = singletons.getDvrDataManager();
         mDvrManager = singletons.getDvrManager();
         mWatchedPositionManager = singletons.getDvrWatchedPositionManager();
@@ -192,8 +193,11 @@ class SeriesRecordingPresenter extends DvrItemPresenter<SeriesRecording> {
 
     @Override
     public DvrItemViewHolder onCreateDvrItemViewHolder() {
-        return new SeriesRecordingViewHolder(new RecordingCardView(mContext), mDvrDataManager,
-                mDvrManager, mWatchedPositionManager);
+        return new SeriesRecordingViewHolder(
+                new RecordingCardView(mContext),
+                mDvrDataManager,
+                mDvrManager,
+                mWatchedPositionManager);
     }
 
     @Override