diff options
author | Xin Li <delphij@google.com> | 2019-07-01 21:00:07 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2019-07-01 21:00:07 +0000 |
commit | effbc99d77bb465246a80f96b2c0128885783f0b (patch) | |
tree | f4ba89447e2d7ac3355508e583a5cf0574c29af5 /tuner/src/com/android/tv/tuner/setup/WelcomeFragment.java | |
parent | c8b794291c5b8b5be03d740355ab33f2df79a76e (diff) | |
parent | d12bfa398c56027290a9e6e4fd14f635458ec581 (diff) | |
download | TV-temp_140451723.tar.gz |
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-mastertemp_140451723
Bug: 134405016
Change-Id: If83c4123ed715e08bc37b8f5772adc84e86298af
Diffstat (limited to 'tuner/src/com/android/tv/tuner/setup/WelcomeFragment.java')
-rw-r--r-- | tuner/src/com/android/tv/tuner/setup/WelcomeFragment.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tuner/src/com/android/tv/tuner/setup/WelcomeFragment.java b/tuner/src/com/android/tv/tuner/setup/WelcomeFragment.java index 788ba918..2a414df7 100644 --- a/tuner/src/com/android/tv/tuner/setup/WelcomeFragment.java +++ b/tuner/src/com/android/tv/tuner/setup/WelcomeFragment.java @@ -24,8 +24,8 @@ import android.support.v17.leanback.widget.GuidedAction; 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.api.Tuner; +import com.android.tv.tuner.prefs.TunerPreferences; import java.util.List; /** A fragment for initial screen. */ @@ -69,14 +69,14 @@ public class WelcomeFragment extends SetupMultiPaneFragment { getArguments() .getInt( BaseTunerSetupActivity.KEY_TUNER_TYPE, - TunerHal.TUNER_TYPE_BUILT_IN); + Tuner.TUNER_TYPE_BUILT_IN); if (mChannelCountOnPreference == 0) { switch (tunerType) { - case TunerHal.TUNER_TYPE_USB: + case Tuner.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: + case Tuner.TUNER_TYPE_NETWORK: title = getString(R.string.nt_setup_new_title); description = getString(R.string.nt_setup_new_description); break; @@ -87,10 +87,10 @@ public class WelcomeFragment extends SetupMultiPaneFragment { } else { title = getString(R.string.bt_setup_again_title); switch (tunerType) { - case TunerHal.TUNER_TYPE_USB: + case Tuner.TUNER_TYPE_USB: description = getString(R.string.ut_setup_again_description); break; - case TunerHal.TUNER_TYPE_NETWORK: + case Tuner.TUNER_TYPE_NETWORK: description = getString(R.string.nt_setup_again_description); break; default: |