1 files changed, 11 insertions, 27 deletions
diff --git a/src/com/android/tv/tuner/setup/WelcomeFragment.java b/src/com/android/tv/tuner/setup/WelcomeFragment.java
index a3dddc72..7e809411 100644
--- a/src/com/android/tv/tuner/setup/WelcomeFragment.java
+++ b/src/com/android/tv/tuner/setup/WelcomeFragment.java
@@ -27,7 +27,6 @@ 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;
 
@@ -42,9 +41,7 @@ public class WelcomeFragment extends SetupMultiPaneFragment {
 
     @Override
     protected SetupGuidedStepFragment onCreateContentFragment() {
-        ContentFragment fragment = new ContentFragment();
-        fragment.setArguments(getArguments());
-        return fragment;
+        return new ContentFragment();
     }
 
     @Override
@@ -73,33 +70,20 @@ 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) {
-                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);
+                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);
                 }
             } else {
                 title = getString(R.string.bt_setup_again_title);
-                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);
+                if (TunerInputInfoUtils.isBuiltInTuner(getActivity())) {
+                    description = getString(R.string.bt_setup_again_description);
+                } else {
+                    description = getString(R.string.ut_setup_again_description);
                 }
             }
             return new Guidance(title, description, null, null);