diff options
author | Live Channels Team <no-reply@google.com> | 2019-04-29 16:08:15 -0700 |
---|---|---|
committer | Nick Chalko <nchalko@google.com> | 2019-05-15 08:58:32 -0700 |
commit | bebfebaaf4d82a2907c2bc87c55b2fbd6cdf449d (patch) | |
tree | 2f59be5a5b42559b2eeacaff8bafb5342fb491cb /src/com/android/tv/modules/TvApplicationModule.java | |
parent | c85adda1e306f7f145588c081299a1e393a36b51 (diff) | |
download | TV-bebfebaaf4d82a2907c2bc87c55b2fbd6cdf449d.tar.gz |
Changes imported from Live Channels
- 245843574 CLEANUP: Remove unused fields and methods from TestSingle... by nchalko <nchalko@google.com>
PiperOrigin-RevId: 245843574
Change-Id: I536e4a683efd642e1ff2f9594f6c08b3abc20b1e
Test: m LiveTv
Diffstat (limited to 'src/com/android/tv/modules/TvApplicationModule.java')
-rw-r--r-- | src/com/android/tv/modules/TvApplicationModule.java | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/src/com/android/tv/modules/TvApplicationModule.java b/src/com/android/tv/modules/TvApplicationModule.java index 45383ae1..26c2be23 100644 --- a/src/com/android/tv/modules/TvApplicationModule.java +++ b/src/com/android/tv/modules/TvApplicationModule.java @@ -17,15 +17,24 @@ package com.android.tv.modules; import android.content.Context; import com.android.tv.MainActivity; +import com.android.tv.SetupPassthroughActivity; import com.android.tv.TvApplication; +import com.android.tv.common.buildtype.BuildTypeModule; import com.android.tv.common.concurrent.NamedThreadFactory; import com.android.tv.common.dagger.ApplicationModule; import com.android.tv.common.dagger.annotations.ApplicationContext; +import com.android.tv.data.ChannelDataManager; +import com.android.tv.data.ChannelDataManagerFactory; +import com.android.tv.dialog.PinDialogFragment; +import com.android.tv.dvr.ui.playback.DvrPlaybackActivity; import com.android.tv.onboarding.OnboardingActivity; +import com.android.tv.ui.DetailsActivity; import com.android.tv.util.AsyncDbTask; import com.android.tv.util.TvInputManagerHelper; import dagger.Module; import dagger.Provides; +import dagger.android.ContributesAndroidInjector; +import com.android.tv.common.flags.LegacyFlags; import java.util.concurrent.Executor; import java.util.concurrent.Executors; import javax.inject.Singleton; @@ -34,25 +43,43 @@ import javax.inject.Singleton; @Module( includes = { ApplicationModule.class, - TvSingletonsModule.class, + BuildTypeModule.class, + DetailsActivity.Module.class, + DvrPlaybackActivity.Module.class, MainActivity.Module.class, - OnboardingActivity.Module.class + OnboardingActivity.Module.class, + SetupPassthroughActivity.Module.class, + TvSingletonsModule.class, }) -public class TvApplicationModule { +public abstract class TvApplicationModule { private static final NamedThreadFactory THREAD_FACTORY = new NamedThreadFactory("tv-app-db"); @Provides @AsyncDbTask.DbExecutor @Singleton - Executor providesDbExecutor() { + static Executor providesDbExecutor() { return Executors.newSingleThreadExecutor(THREAD_FACTORY); } @Provides @Singleton - TvInputManagerHelper providesTvInputManagerHelper(@ApplicationContext Context context) { - TvInputManagerHelper tvInputManagerHelper = new TvInputManagerHelper(context); + static TvInputManagerHelper providesTvInputManagerHelper( + @ApplicationContext Context context, LegacyFlags legacyFlags) { + TvInputManagerHelper tvInputManagerHelper = new TvInputManagerHelper(context, legacyFlags); tvInputManagerHelper.start(); + // Since this is injected as a Lazy in the application start is delayed. return tvInputManagerHelper; } + + @Provides + @Singleton + static ChannelDataManager providesChannelDataManager(ChannelDataManagerFactory factory) { + ChannelDataManager channelDataManager = factory.create(); + channelDataManager.start(); + // Since this is injected as a Lazy in the application start is delayed. + return channelDataManager; + } + + @ContributesAndroidInjector + abstract PinDialogFragment contributesPinDialogFragment(); } |