1 files changed, 32 insertions, 22 deletions

diff --git a/src/com/android/tv/tuner/setup/WelcomeFragment.java b/src/com/android/tv/tuner/setup/WelcomeFragment.java
index 7e809411..feae1ec9 100644
--- a/src/com/android/tv/tuner/setup/WelcomeFragment.java
+++ b/src/com/android/tv/tuner/setup/WelcomeFragment.java
@@ -18,18 +18,14 @@ package com.android.tv.tuner.setup;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v17.leanback.widget.GuidanceStylist.Guidance;
 import android.support.v17.leanback.widget.GuidedAction;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 import com.android.tv.common.ui.setup.SetupGuidedStepFragment;
 import com.android.tv.common.ui.setup.SetupMultiPaneFragment;
 import com.android.tv.tuner.R;
+import com.android.tv.tuner.TunerHal;
 import com.android.tv.tuner.TunerPreferences;
-import com.android.tv.tuner.util.TunerInputInfoUtils;
-
 import java.util.List;
 
 /**
@@ -41,7 +37,9 @@ public class WelcomeFragment extends SetupMultiPaneFragment {
 
     @Override
     protected SetupGuidedStepFragment onCreateContentFragment() {
-        return new ContentFragment();
+        ContentFragment fragment = new ContentFragment();
+        fragment.setArguments(getArguments());
+        return fragment;
     }
 
     @Override
@@ -58,11 +56,10 @@ public class WelcomeFragment extends SetupMultiPaneFragment {
         private int mChannelCountOnPreference;
 
         @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            mChannelCountOnPreference = TunerPreferences
-                    .getScannedChannelCount(getActivity().getApplicationContext());
-            return super.onCreateView(inflater, container, savedInstanceState);
+        public void onCreate(@Nullable Bundle savedInstanceState) {
+            mChannelCountOnPreference =
+                    TunerPreferences.getScannedChannelCount(getActivity().getApplicationContext());
+            super.onCreate(savedInstanceState);
         }
 
         @NonNull
@@ -70,20 +67,33 @@ public class WelcomeFragment extends SetupMultiPaneFragment {
         public Guidance onCreateGuidance(Bundle savedInstanceState) {
             String title;
             String description;
+            int tunerType = getArguments().getInt(TunerSetupActivity.KEY_TUNER_TYPE,
+                    TunerHal.TUNER_TYPE_BUILT_IN);
             if (mChannelCountOnPreference == 0) {
-                if (TunerInputInfoUtils.isBuiltInTuner(getActivity())) {
-                    title = getString(R.string.bt_setup_new_title);
-                    description = getString(R.string.bt_setup_new_description);
-                } else {
-                    title = getString(R.string.ut_setup_new_title);
-                    description = getString(R.string.ut_setup_new_description);
+                switch (tunerType) {
+                    case TunerHal.TUNER_TYPE_USB:
+                        title = getString(R.string.ut_setup_new_title);
+                        description = getString(R.string.ut_setup_new_description);
+                        break;
+                    case TunerHal.TUNER_TYPE_NETWORK:
+                        title = getString(R.string.nt_setup_new_title);
+                        description = getString(R.string.nt_setup_new_description);
+                        break;
+                    default:
+                        title = getString(R.string.bt_setup_new_title);
+                        description = getString(R.string.bt_setup_new_description);
                 }
             } else {
                 title = getString(R.string.bt_setup_again_title);
-                if (TunerInputInfoUtils.isBuiltInTuner(getActivity())) {
-                    description = getString(R.string.bt_setup_again_description);
-                } else {
-                    description = getString(R.string.ut_setup_again_description);
+                switch (tunerType) {
+                    case TunerHal.TUNER_TYPE_USB:
+                        description = getString(R.string.ut_setup_again_description);
+                        break;
+                    case TunerHal.TUNER_TYPE_NETWORK:
+                        description = getString(R.string.nt_setup_again_description);
+                        break;
+                    default:
+                        description = getString(R.string.bt_setup_again_description);
                 }
             }
             return new Guidance(title, description, null, null);