diff options
Diffstat (limited to 'src/com/android/tv/dvr/ui/browse')
17 files changed, 43 insertions, 47 deletions
diff --git a/src/com/android/tv/dvr/ui/browse/CurrentRecordingDetailsFragment.java b/src/com/android/tv/dvr/ui/browse/CurrentRecordingDetailsFragment.java index 7e7e1f75..22246e5a 100644 --- a/src/com/android/tv/dvr/ui/browse/CurrentRecordingDetailsFragment.java +++ b/src/com/android/tv/dvr/ui/browse/CurrentRecordingDetailsFragment.java @@ -22,7 +22,7 @@ import android.support.v17.leanback.widget.Action; import android.support.v17.leanback.widget.OnActionClickedListener; import android.support.v17.leanback.widget.SparseArrayObjectAdapter; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.dialog.HalfSizedDialogFragment; import com.android.tv.dvr.DvrDataManager; import com.android.tv.dvr.DvrManager; @@ -66,7 +66,7 @@ public class CurrentRecordingDetailsFragment extends RecordingDetailsFragment { @Override public void onAttach(Context context) { super.onAttach(context); - mDvrDataManger = TvSingletons.getSingletons(context).getDvrDataManager(); + mDvrDataManger = TvApplication.getSingletons(context).getDvrDataManager(); mDvrDataManger.addScheduledRecordingListener(mScheduledRecordingListener); } @@ -100,7 +100,7 @@ public class CurrentRecordingDetailsFragment extends RecordingDetailsFragment { public void onActionClick(long actionId) { if (actionId == DvrStopRecordingFragment.ACTION_STOP) { DvrManager dvrManager = - TvSingletons.getSingletons(getContext()) + TvApplication.getSingletons(getContext()) .getDvrManager(); dvrManager.stopRecording(getRecording()); getActivity().finish(); diff --git a/src/com/android/tv/dvr/ui/browse/DetailsContent.java b/src/com/android/tv/dvr/ui/browse/DetailsContent.java index 70903373..9f588aa3 100644 --- a/src/com/android/tv/dvr/ui/browse/DetailsContent.java +++ b/src/com/android/tv/dvr/ui/browse/DetailsContent.java @@ -21,7 +21,7 @@ import android.media.tv.TvContract; import android.support.annotation.Nullable; import android.text.TextUtils; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.data.Channel; import com.android.tv.dvr.data.RecordedProgram; import com.android.tv.dvr.data.ScheduledRecording; @@ -76,7 +76,7 @@ class DetailsContent { static DetailsContent createFromScheduledRecording( Context context, ScheduledRecording scheduledRecording) { Channel channel = - TvSingletons.getSingletons(context) + TvApplication.getSingletons(context) .getChannelDataManager() .getChannel(scheduledRecording.getChannelId()); String description = @@ -278,7 +278,7 @@ class DetailsContent { /** Builds details content. */ public DetailsContent build(Context context) { Channel channel = - TvSingletons.getSingletons(context) + TvApplication.getSingletons(context) .getChannelDataManager() .getChannel(mChannelId); if (mDetailsContent.mTitle == null) { diff --git a/src/com/android/tv/dvr/ui/browse/DetailsViewBackgroundHelper.java b/src/com/android/tv/dvr/ui/browse/DetailsViewBackgroundHelper.java index 849360b8..5a058454 100644 --- a/src/com/android/tv/dvr/ui/browse/DetailsViewBackgroundHelper.java +++ b/src/com/android/tv/dvr/ui/browse/DetailsViewBackgroundHelper.java @@ -57,7 +57,6 @@ class DetailsViewBackgroundHelper { public DetailsViewBackgroundHelper(Activity activity) { mBackgroundManager = BackgroundManager.getInstance(activity); mBackgroundManager.attach(activity.getWindow()); - mBackgroundManager.setAutoReleaseOnStop(false); } /** Sets the given image to background. */ diff --git a/src/com/android/tv/dvr/ui/browse/DvrBrowseActivity.java b/src/com/android/tv/dvr/ui/browse/DvrBrowseActivity.java index 6cc1c7a1..f208b5e8 100644 --- a/src/com/android/tv/dvr/ui/browse/DvrBrowseActivity.java +++ b/src/com/android/tv/dvr/ui/browse/DvrBrowseActivity.java @@ -21,7 +21,7 @@ import android.content.Intent; import android.media.tv.TvInputManager; import android.os.Bundle; import com.android.tv.R; -import com.android.tv.Starter; +import com.android.tv.TvApplication; /** {@link android.app.Activity} for DVR UI. */ public class DvrBrowseActivity extends Activity { @@ -29,7 +29,7 @@ public class DvrBrowseActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { - Starter.start(this); + TvApplication.setCurrentRunningProcess(this, true); super.onCreate(savedInstanceState); setContentView(R.layout.dvr_main); mFragment = (DvrBrowseFragment) getFragmentManager().findFragmentById(R.id.dvr_frame); diff --git a/src/com/android/tv/dvr/ui/browse/DvrBrowseFragment.java b/src/com/android/tv/dvr/ui/browse/DvrBrowseFragment.java index 90326a8b..f8a54ef0 100644 --- a/src/com/android/tv/dvr/ui/browse/DvrBrowseFragment.java +++ b/src/com/android/tv/dvr/ui/browse/DvrBrowseFragment.java @@ -16,9 +16,7 @@ package com.android.tv.dvr.ui.browse; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.support.v17.leanback.app.BrowseFragment; @@ -31,8 +29,9 @@ import android.support.v17.leanback.widget.TitleViewAdapter; import android.util.Log; import android.view.View; import android.view.ViewTreeObserver.OnGlobalFocusChangeListener; +import com.android.tv.ApplicationSingletons; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.data.GenreItems; import com.android.tv.dvr.DvrDataManager; import com.android.tv.dvr.DvrDataManager.OnDvrScheduleLoadFinishedListener; @@ -52,8 +51,6 @@ import java.util.HashMap; import java.util.List; /** {@link BrowseFragment} for DVR functions. */ -@TargetApi(Build.VERSION_CODES.N) -@SuppressWarnings("AndroidApiChecker") // TODO(b/32513850) remove when error prone is updated public class DvrBrowseFragment extends BrowseFragment implements RecordedProgramListener, ScheduledRecordingListener, @@ -171,7 +168,7 @@ public class DvrBrowseFragment extends BrowseFragment if (DEBUG) Log.d(TAG, "onCreate"); super.onCreate(savedInstanceState); Context context = getContext(); - TvSingletons singletons = TvSingletons.getSingletons(context); + ApplicationSingletons singletons = TvApplication.getSingletons(context); mDvrDataManager = singletons.getDvrDataManager(); mDvrScheudleManager = singletons.getDvrScheduleManager(); mPresenterSelector = diff --git a/src/com/android/tv/dvr/ui/browse/DvrDetailsActivity.java b/src/com/android/tv/dvr/ui/browse/DvrDetailsActivity.java index 2659c3f3..a953f1d2 100644 --- a/src/com/android/tv/dvr/ui/browse/DvrDetailsActivity.java +++ b/src/com/android/tv/dvr/ui/browse/DvrDetailsActivity.java @@ -23,7 +23,7 @@ import android.transition.Transition; import android.transition.Transition.TransitionListener; import android.view.View; import com.android.tv.R; -import com.android.tv.Starter; +import com.android.tv.TvApplication; import com.android.tv.dialog.PinDialogFragment; /** Activity to show details view in DVR. */ @@ -59,7 +59,7 @@ public class DvrDetailsActivity extends Activity implements PinDialogFragment.On @Override public void onCreate(Bundle savedInstanceState) { - Starter.start(this); + TvApplication.setCurrentRunningProcess(this, true); super.onCreate(savedInstanceState); setContentView(R.layout.activity_dvr_details); long recordId = getIntent().getLongExtra(RECORDING_ID, -1); diff --git a/src/com/android/tv/dvr/ui/browse/DvrDetailsFragment.java b/src/com/android/tv/dvr/ui/browse/DvrDetailsFragment.java index 209fc6e1..f03f3f58 100644 --- a/src/com/android/tv/dvr/ui/browse/DvrDetailsFragment.java +++ b/src/com/android/tv/dvr/ui/browse/DvrDetailsFragment.java @@ -37,9 +37,8 @@ import android.support.v17.leanback.widget.VerticalGridView; import android.text.TextUtils; import android.widget.Toast; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.common.SoftPreconditions; -import com.android.tv.common.util.CommonUtils; import com.android.tv.data.Channel; import com.android.tv.data.ChannelDataManager; import com.android.tv.dialog.PinDialogFragment; @@ -49,6 +48,7 @@ import com.android.tv.dvr.ui.DvrUiHelper; import com.android.tv.parental.ParentalControlSettings; import com.android.tv.util.ImageLoader; import com.android.tv.util.ToastUtils; +import com.android.tv.util.Utils; import java.io.File; abstract class DvrDetailsFragment extends DetailsFragment { @@ -195,7 +195,7 @@ abstract class DvrDetailsFragment extends DetailsFragment { } protected void startPlayback(RecordedProgram recordedProgram, long seekTimeMs) { - if (CommonUtils.isInBundledPackageSet(recordedProgram.getPackageName()) + if (Utils.isInBundledPackageSet(recordedProgram.getPackageName()) && !isDataUriAccessible(recordedProgram.getDataUri())) { // Since cleaning RecordedProgram from forgotten storage will take some time, // ignore playback until cleaning is finished. @@ -207,7 +207,7 @@ abstract class DvrDetailsFragment extends DetailsFragment { } long programId = recordedProgram.getId(); ParentalControlSettings parental = - TvSingletons.getSingletons(getActivity()) + TvApplication.getSingletons(getActivity()) .getTvInputManagerHelper() .getParentalControlSettings(); if (!parental.isParentalControlsEnabled()) { @@ -215,7 +215,7 @@ abstract class DvrDetailsFragment extends DetailsFragment { return; } ChannelDataManager channelDataManager = - TvSingletons.getSingletons(getActivity()).getChannelDataManager(); + TvApplication.getSingletons(getActivity()).getChannelDataManager(); Channel channel = channelDataManager.getChannel(recordedProgram.getChannelId()); if (channel != null && channel.isLocked()) { checkPinToPlay(recordedProgram, seekTimeMs); diff --git a/src/com/android/tv/dvr/ui/browse/DvrItemPresenter.java b/src/com/android/tv/dvr/ui/browse/DvrItemPresenter.java index 1e5f6935..4298d86a 100644 --- a/src/com/android/tv/dvr/ui/browse/DvrItemPresenter.java +++ b/src/com/android/tv/dvr/ui/browse/DvrItemPresenter.java @@ -31,9 +31,8 @@ import java.util.Set; /** * An abstract class to present DVR items in {@link RecordingCardView}, which is mainly used in * {@link DvrBrowseFragment}. DVR items might include: {@link - * com.android.tv.dvr.data.ScheduledRecording}, {@link - * com.android.tv.dvr.data.RecordedProgram}, and {@link - * com.android.tv.dvr.data.SeriesRecording}. + * com.android.tv.dvr.data.ScheduledRecording}, {@link com.android.tv.dvr.data.RecordedProgram}, and + * {@link com.android.tv.dvr.data.SeriesRecording}. */ public abstract class DvrItemPresenter<T> extends Presenter { protected final Context mContext; diff --git a/src/com/android/tv/dvr/ui/browse/FullSchedulesCardPresenter.java b/src/com/android/tv/dvr/ui/browse/FullSchedulesCardPresenter.java index af0f24c0..88133331 100644 --- a/src/com/android/tv/dvr/ui/browse/FullSchedulesCardPresenter.java +++ b/src/com/android/tv/dvr/ui/browse/FullSchedulesCardPresenter.java @@ -20,7 +20,7 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.view.View; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.dvr.data.ScheduledRecording; import com.android.tv.dvr.ui.DvrUiHelper; import com.android.tv.util.Utils; @@ -50,7 +50,7 @@ class FullSchedulesCardPresenter extends DvrItemPresenter<Object> { cardView.setTitle(mCardTitleText); cardView.setImage(mIconDrawable); List<ScheduledRecording> scheduledRecordings = - TvSingletons.getSingletons(mContext) + TvApplication.getSingletons(mContext) .getDvrDataManager() .getAvailableScheduledRecordings(); int fullDays = 0; diff --git a/src/com/android/tv/dvr/ui/browse/RecordedProgramDetailsFragment.java b/src/com/android/tv/dvr/ui/browse/RecordedProgramDetailsFragment.java index 47b1a198..3b3401b2 100644 --- a/src/com/android/tv/dvr/ui/browse/RecordedProgramDetailsFragment.java +++ b/src/com/android/tv/dvr/ui/browse/RecordedProgramDetailsFragment.java @@ -23,7 +23,7 @@ import android.support.v17.leanback.widget.Action; import android.support.v17.leanback.widget.OnActionClickedListener; import android.support.v17.leanback.widget.SparseArrayObjectAdapter; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.dvr.DvrDataManager; import com.android.tv.dvr.DvrManager; import com.android.tv.dvr.DvrWatchedPositionManager; @@ -44,7 +44,7 @@ public class RecordedProgramDetailsFragment extends DvrDetailsFragment @Override public void onCreate(Bundle savedInstanceState) { - mDvrDataManager = TvSingletons.getSingletons(getContext()).getDvrDataManager(); + mDvrDataManager = TvApplication.getSingletons(getContext()).getDvrDataManager(); mDvrDataManager.addRecordedProgramListener(this); super.onCreate(savedInstanceState); } @@ -52,7 +52,7 @@ public class RecordedProgramDetailsFragment extends DvrDetailsFragment @Override public void onCreateInternal() { mDvrWatchedPositionManager = - TvSingletons.getSingletons(getActivity()).getDvrWatchedPositionManager(); + TvApplication.getSingletons(getActivity()).getDvrWatchedPositionManager(); setDetailsOverviewRow( DetailsContent.createFromRecordedProgram(getContext(), mRecordedProgram)); } @@ -139,7 +139,7 @@ public class RecordedProgramDetailsFragment extends DvrDetailsFragment mRecordedProgram.getId())); } else if (action.getId() == ACTION_DELETE_RECORDING) { DvrManager dvrManager = - TvSingletons.getSingletons(getActivity()).getDvrManager(); + TvApplication.getSingletons(getActivity()).getDvrManager(); dvrManager.removeRecordedProgram(mRecordedProgram); getActivity().finish(); } diff --git a/src/com/android/tv/dvr/ui/browse/RecordedProgramPresenter.java b/src/com/android/tv/dvr/ui/browse/RecordedProgramPresenter.java index e2db3ac4..aad1cc6a 100644 --- a/src/com/android/tv/dvr/ui/browse/RecordedProgramPresenter.java +++ b/src/com/android/tv/dvr/ui/browse/RecordedProgramPresenter.java @@ -19,7 +19,7 @@ package com.android.tv.dvr.ui.browse; import android.content.Context; import android.media.tv.TvInputManager; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.dvr.DvrWatchedPositionManager; import com.android.tv.dvr.DvrWatchedPositionManager.WatchedPositionChangedListener; import com.android.tv.dvr.data.RecordedProgram; @@ -95,7 +95,7 @@ public class RecordedProgramPresenter extends DvrItemPresenter<RecordedProgram> mTodayString = mContext.getString(R.string.dvr_date_today); mYesterdayString = mContext.getString(R.string.dvr_date_yesterday); mDvrWatchedPositionManager = - TvSingletons.getSingletons(mContext).getDvrWatchedPositionManager(); + TvApplication.getSingletons(mContext).getDvrWatchedPositionManager(); mProgressBarColor = mContext.getResources().getColor(R.color.play_controls_progress_bar_watched); mShowEpisodeTitle = showEpisodeTitle; diff --git a/src/com/android/tv/dvr/ui/browse/RecordingCardView.java b/src/com/android/tv/dvr/ui/browse/RecordingCardView.java index 0a204c14..edee5d3a 100644 --- a/src/com/android/tv/dvr/ui/browse/RecordingCardView.java +++ b/src/com/android/tv/dvr/ui/browse/RecordingCardView.java @@ -37,8 +37,8 @@ import com.android.tv.ui.ViewUtils; import com.android.tv.util.ImageLoader; /** - * A CardView for displaying info about a {@link com.android.tv.dvr.data.ScheduledRecording} - * or {@link RecordedProgram} or {@link com.android.tv.dvr.data.SeriesRecording}. + * A CardView for displaying info about a {@link com.android.tv.dvr.data.ScheduledRecording} or + * {@link RecordedProgram} or {@link com.android.tv.dvr.data.SeriesRecording}. */ public class RecordingCardView extends BaseCardView { // This value should be the same with diff --git a/src/com/android/tv/dvr/ui/browse/RecordingDetailsFragment.java b/src/com/android/tv/dvr/ui/browse/RecordingDetailsFragment.java index e4d95630..c8f1c785 100644 --- a/src/com/android/tv/dvr/ui/browse/RecordingDetailsFragment.java +++ b/src/com/android/tv/dvr/ui/browse/RecordingDetailsFragment.java @@ -18,7 +18,7 @@ package com.android.tv.dvr.ui.browse; import android.os.Bundle; import android.support.v17.leanback.app.DetailsFragment; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.dvr.data.ScheduledRecording; /** {@link DetailsFragment} for recordings in DVR. */ @@ -35,7 +35,7 @@ abstract class RecordingDetailsFragment extends DvrDetailsFragment { protected boolean onLoadRecordingDetails(Bundle args) { long scheduledRecordingId = args.getLong(DvrDetailsActivity.RECORDING_ID); mRecording = - TvSingletons.getSingletons(getContext()) + TvApplication.getSingletons(getContext()) .getDvrDataManager() .getScheduledRecording(scheduledRecordingId); return mRecording != null; diff --git a/src/com/android/tv/dvr/ui/browse/ScheduledRecordingDetailsFragment.java b/src/com/android/tv/dvr/ui/browse/ScheduledRecordingDetailsFragment.java index 0765117d..b3e6ebb3 100644 --- a/src/com/android/tv/dvr/ui/browse/ScheduledRecordingDetailsFragment.java +++ b/src/com/android/tv/dvr/ui/browse/ScheduledRecordingDetailsFragment.java @@ -22,7 +22,7 @@ import android.support.v17.leanback.widget.Action; import android.support.v17.leanback.widget.OnActionClickedListener; import android.support.v17.leanback.widget.SparseArrayObjectAdapter; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.dvr.DvrManager; import com.android.tv.dvr.ui.DvrUiHelper; @@ -37,7 +37,7 @@ public class ScheduledRecordingDetailsFragment extends RecordingDetailsFragment @Override public void onCreate(Bundle savedInstance) { - mDvrManager = TvSingletons.getSingletons(getContext()).getDvrManager(); + mDvrManager = TvApplication.getSingletons(getContext()).getDvrManager(); mHideViewSchedule = getArguments().getBoolean(DvrDetailsActivity.HIDE_VIEW_SCHEDULE); super.onCreate(savedInstance); } diff --git a/src/com/android/tv/dvr/ui/browse/ScheduledRecordingPresenter.java b/src/com/android/tv/dvr/ui/browse/ScheduledRecordingPresenter.java index f1ed52c8..fa948447 100644 --- a/src/com/android/tv/dvr/ui/browse/ScheduledRecordingPresenter.java +++ b/src/com/android/tv/dvr/ui/browse/ScheduledRecordingPresenter.java @@ -19,7 +19,7 @@ package com.android.tv.dvr.ui.browse; import android.content.Context; import android.os.Handler; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.dvr.DvrManager; import com.android.tv.dvr.data.ScheduledRecording; import com.android.tv.util.Utils; @@ -100,7 +100,7 @@ class ScheduledRecordingPresenter extends DvrItemPresenter<ScheduledRecording> { public ScheduledRecordingPresenter(Context context) { super(context); - mDvrManager = TvSingletons.getSingletons(mContext).getDvrManager(); + mDvrManager = TvApplication.getSingletons(mContext).getDvrManager(); mProgressBarColor = mContext.getResources() .getColor(R.color.play_controls_recording_icon_color_on_focus); diff --git a/src/com/android/tv/dvr/ui/browse/SeriesRecordingDetailsFragment.java b/src/com/android/tv/dvr/ui/browse/SeriesRecordingDetailsFragment.java index 2cd191a7..48bc9cbd 100644 --- a/src/com/android/tv/dvr/ui/browse/SeriesRecordingDetailsFragment.java +++ b/src/com/android/tv/dvr/ui/browse/SeriesRecordingDetailsFragment.java @@ -33,7 +33,7 @@ import android.support.v17.leanback.widget.PresenterSelector; import android.support.v17.leanback.widget.SparseArrayObjectAdapter; import android.text.TextUtils; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.data.BaseProgram; import com.android.tv.dvr.DvrDataManager; import com.android.tv.dvr.DvrWatchedPositionManager; @@ -73,7 +73,7 @@ public class SeriesRecordingDetailsFragment extends DvrDetailsFragment @Override public void onCreate(Bundle savedInstanceState) { - mDvrDataManager = TvSingletons.getSingletons(getActivity()).getDvrDataManager(); + mDvrDataManager = TvApplication.getSingletons(getActivity()).getDvrDataManager(); mWatchLabel = getString(R.string.dvr_detail_watch); mResumeLabel = getString(R.string.dvr_detail_series_resume); mWatchDrawable = getResources().getDrawable(R.drawable.lb_ic_play, null); @@ -84,7 +84,7 @@ public class SeriesRecordingDetailsFragment extends DvrDetailsFragment @Override protected void onCreateInternal() { mDvrWatchedPositionManager = - TvSingletons.getSingletons(getActivity()).getDvrWatchedPositionManager(); + TvApplication.getSingletons(getActivity()).getDvrWatchedPositionManager(); setDetailsOverviewRow(DetailsContent.createFromSeriesRecording(getContext(), mSeries)); setupRecordedProgramsRow(); mDvrDataManager.addSeriesRecordingListener(this); @@ -137,7 +137,7 @@ public class SeriesRecordingDetailsFragment extends DvrDetailsFragment protected boolean onLoadRecordingDetails(Bundle args) { long recordId = args.getLong(DvrDetailsActivity.RECORDING_ID); mSeries = - TvSingletons.getSingletons(getActivity()) + TvApplication.getSingletons(getActivity()) .getDvrDataManager() .getSeriesRecording(recordId); if (mSeries == null) { diff --git a/src/com/android/tv/dvr/ui/browse/SeriesRecordingPresenter.java b/src/com/android/tv/dvr/ui/browse/SeriesRecordingPresenter.java index 14f9dceb..02ce24ef 100644 --- a/src/com/android/tv/dvr/ui/browse/SeriesRecordingPresenter.java +++ b/src/com/android/tv/dvr/ui/browse/SeriesRecordingPresenter.java @@ -19,8 +19,9 @@ 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.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.dvr.DvrDataManager; import com.android.tv.dvr.DvrDataManager.RecordedProgramListener; import com.android.tv.dvr.DvrDataManager.ScheduledRecordingListener; @@ -185,7 +186,7 @@ class SeriesRecordingPresenter extends DvrItemPresenter<SeriesRecording> { public SeriesRecordingPresenter(Context context) { super(context); - TvSingletons singletons = TvSingletons.getSingletons(context); + ApplicationSingletons singletons = TvApplication.getSingletons(context); mDvrDataManager = singletons.getDvrDataManager(); mDvrManager = singletons.getDvrManager(); mWatchedPositionManager = singletons.getDvrWatchedPositionManager(); |