diff options
Diffstat (limited to 'src/com')
22 files changed, 116 insertions, 109 deletions
diff --git a/src/com/android/tv/LauncherActivity.java b/src/com/android/tv/LauncherActivity.java index 3aca35a4..679d612d 100644 --- a/src/com/android/tv/LauncherActivity.java +++ b/src/com/android/tv/LauncherActivity.java @@ -35,8 +35,7 @@ import android.util.Log; public class LauncherActivity extends Activity { private static final String TAG = "LauncherActivity"; - public static final String ERROR_MESSAGE = - "com.android.tv.LauncherActivity.ErrorMessage"; + public static final String ERROR_MESSAGE = "com.android.tv.LauncherActivity.ErrorMessage"; private static final int REQUEST_CODE_DEFAULT = 0; private static final int REQUEST_START_ACTIVITY = 100; diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java index 22ee9321..14cfb6c1 100644 --- a/src/com/android/tv/MainActivity.java +++ b/src/com/android/tv/MainActivity.java @@ -95,7 +95,6 @@ import com.android.tv.dvr.data.ScheduledRecording; import com.android.tv.dvr.recorder.ConflictChecker; import com.android.tv.dvr.ui.DvrStopRecordingFragment; import com.android.tv.dvr.ui.DvrUiHelper; - import com.android.tv.menu.Menu; import com.android.tv.onboarding.OnboardingActivity; import com.android.tv.parental.ContentRatingsManager; @@ -135,6 +134,7 @@ import com.android.tv.util.TvTrackInfoUtils; import com.android.tv.util.Utils; import com.android.tv.util.ViewCache; import com.android.tv.util.account.AccountHelper; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayDeque; @@ -411,8 +411,7 @@ public class MainActivity extends Activity implements OnActionClickListener, OnP && mTunerInputId.equals(inputId) && CommonPreferences.shouldShowSetupActivity(MainActivity.this)) { Intent intent = - TvSingletons - .getSingletons(MainActivity.this) + TvSingletons.getSingletons(MainActivity.this) .getTunerSetupIntent(MainActivity.this); startActivity(intent); CommonPreferences.setShouldShowSetupActivity(MainActivity.this, false); diff --git a/src/com/android/tv/SetupPassthroughActivity.java b/src/com/android/tv/SetupPassthroughActivity.java index 40d38118..7502555b 100644 --- a/src/com/android/tv/SetupPassthroughActivity.java +++ b/src/com/android/tv/SetupPassthroughActivity.java @@ -33,10 +33,10 @@ import com.android.tv.data.ChannelDataManager; import com.android.tv.data.ChannelDataManager.Listener; import com.android.tv.data.epg.EpgFetcher; import com.android.tv.data.epg.EpgInputWhiteList; - import com.android.tv.util.SetupUtils; import com.android.tv.util.TvInputManagerHelper; import com.android.tv.util.Utils; + import java.util.concurrent.TimeUnit; /** diff --git a/src/com/android/tv/TvApplication.java b/src/com/android/tv/TvApplication.java index 01fe5b07..247509fc 100644 --- a/src/com/android/tv/TvApplication.java +++ b/src/com/android/tv/TvApplication.java @@ -77,11 +77,11 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet /** * Broadcast Action: The user has updated LC to a new version that supports tuner input. {@link - * com.android.tv.tuner.TunerInputController} will recevice this intent to check the - * existence of tuner input when the new version is first launched. + * TunerInputController} will receive this intent to check the existence of tuner input when the + * new version is first launched. */ public static final String ACTION_APPLICATION_FIRST_LAUNCHED = - "com.android.tv.action.APPLICATION_FIRST_LAUNCHED"; + " com.android.tv.action.APPLICATION_FIRST_LAUNCHED"; private static final String PREFERENCE_IS_FIRST_LAUNCH = "is_first_launch"; diff --git a/src/com/android/tv/analytics/SendChannelStatusRunnable.java b/src/com/android/tv/analytics/SendChannelStatusRunnable.java index 2f208828..601e82f7 100644 --- a/src/com/android/tv/analytics/SendChannelStatusRunnable.java +++ b/src/com/android/tv/analytics/SendChannelStatusRunnable.java @@ -31,8 +31,7 @@ import java.util.concurrent.TimeUnit; * * <p> * - * <p>This should only be started from a user activity like {@link - * com.android.tv.MainActivity}. + * <p>This should only be started from a user activity like {@link com.android.tv.MainActivity}. */ @MainThread public class SendChannelStatusRunnable implements Runnable { diff --git a/src/com/android/tv/app/LiveTvApplication.java b/src/com/android/tv/app/LiveTvApplication.java index 1c4f1522..f6ac2441 100644 --- a/src/com/android/tv/app/LiveTvApplication.java +++ b/src/com/android/tv/app/LiveTvApplication.java @@ -20,7 +20,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.media.tv.TvContract; -import com.android.tv.tuner.tvinput.LiveTvTunerTvInputService; import com.android.tv.TvApplication; import com.android.tv.analytics.Analytics; import com.android.tv.analytics.StubAnalytics; @@ -34,6 +33,7 @@ import com.android.tv.data.epg.EpgReader; import com.android.tv.data.epg.StubEpgReader; import com.android.tv.perf.PerformanceMonitor; import com.android.tv.perf.StubPerformanceMonitor; +import com.android.tv.tuner.livetuner.LiveTvTunerTvInputService; import com.android.tv.tuner.setup.LiveTvTunerSetupActivity; import com.android.tv.util.account.AccountHelper; import com.android.tv.util.account.AccountHelperImpl; @@ -41,7 +41,8 @@ import javax.inject.Provider; /** The top level application for Live TV. */ public class LiveTvApplication extends TvApplication { - protected static final String TV_ACTIVITY_CLASS_NAME = "com.android.tv.TvActivity"; + protected static final String TV_ACTIVITY_CLASS_NAME = + CommonConstants.BASE_PACKAGE + ".TvActivity"; private final StubPerformanceMonitor performanceMonitor = new StubPerformanceMonitor(); private final Provider<EpgReader> mEpgReaderProvider = diff --git a/src/com/android/tv/data/epg/EpgFetchHelper.java b/src/com/android/tv/data/epg/EpgFetchHelper.java index 30123ee5..b6be111f 100644 --- a/src/com/android/tv/data/epg/EpgFetchHelper.java +++ b/src/com/android/tv/data/epg/EpgFetchHelper.java @@ -27,6 +27,7 @@ import android.preference.PreferenceManager; import android.support.annotation.WorkerThread; import android.text.TextUtils; import android.util.Log; +import com.android.tv.common.CommonConstants; import com.android.tv.common.util.Clock; import com.android.tv.data.Program; import java.util.ArrayList; @@ -45,10 +46,10 @@ class EpgFetchHelper { // Value: Long private static final String KEY_LAST_UPDATED_EPG_TIMESTAMP = - "com.android.tv.data.epg.EpgFetcher.LastUpdatedEpgTimestamp"; + CommonConstants.BASE_PACKAGE + ".data.epg.EpgFetcher.LastUpdatedEpgTimestamp"; // Value: String private static final String KEY_LAST_LINEUP_ID = - "com.android.tv.data.epg.EpgFetcher.LastLineupId"; + CommonConstants.BASE_PACKAGE + ".data.epg.EpgFetcher.LastLineupId"; private static long sLastEpgUpdatedTimestamp = -1; private static String sLastLineupId; diff --git a/src/com/android/tv/data/epg/EpgFetcherImpl.java b/src/com/android/tv/data/epg/EpgFetcherImpl.java index 523fc50c..d75941fc 100644 --- a/src/com/android/tv/data/epg/EpgFetcherImpl.java +++ b/src/com/android/tv/data/epg/EpgFetcherImpl.java @@ -54,12 +54,12 @@ import com.android.tv.data.ChannelDataManager; import com.android.tv.data.ChannelLogoFetcher; import com.android.tv.data.Lineup; import com.android.tv.data.Program; - - import com.android.tv.perf.EventNames; import com.android.tv.perf.PerformanceMonitor; import com.android.tv.perf.TimerEvent; import com.android.tv.util.Utils; + + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/src/com/android/tv/dvr/ui/DvrGuidedStepFragment.java b/src/com/android/tv/dvr/ui/DvrGuidedStepFragment.java index 793bd01b..a900cc70 100644 --- a/src/com/android/tv/dvr/ui/DvrGuidedStepFragment.java +++ b/src/com/android/tv/dvr/ui/DvrGuidedStepFragment.java @@ -114,8 +114,8 @@ public abstract class DvrGuidedStepFragment extends TrackedGuidedStepFragment { } /** - * The inner guided step fragment for {@link - * com.android.tv.dvr.ui.DvrHalfSizedDialogFragment .DvrNoFreeSpaceErrorDialogFragment}. + * The inner guided step fragment for {@link com.android.tv.dvr.ui.DvrHalfSizedDialogFragment + * .DvrNoFreeSpaceErrorDialogFragment}. */ public static class DvrNoFreeSpaceErrorFragment extends DvrGuidedStepFragment { @Override @@ -154,8 +154,7 @@ public abstract class DvrGuidedStepFragment extends TrackedGuidedStepFragment { } /** - * The inner guided step fragment for {@link - * com.android.tv.dvr.ui.DvrHalfSizedDialogFragment + * The inner guided step fragment for {@link com.android.tv.dvr.ui.DvrHalfSizedDialogFragment * .DvrSmallSizedStorageErrorDialogFragment}. */ public static class DvrSmallSizedStorageErrorFragment extends DvrGuidedStepFragment { 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/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/guide/ProgramTableAdapter.java b/src/com/android/tv/guide/ProgramTableAdapter.java index c77673a2..935f8b3a 100644 --- a/src/com/android/tv/guide/ProgramTableAdapter.java +++ b/src/com/android/tv/guide/ProgramTableAdapter.java @@ -58,7 +58,6 @@ import com.android.tv.dvr.DvrDataManager; import com.android.tv.dvr.DvrManager; import com.android.tv.dvr.data.ScheduledRecording; import com.android.tv.guide.ProgramManager.TableEntriesUpdatedListener; - import com.android.tv.parental.ParentalControlSettings; import com.android.tv.ui.HardwareLayerAnimatorListenerAdapter; import com.android.tv.util.ImageCache; @@ -67,6 +66,7 @@ import com.android.tv.util.ImageLoader.ImageLoaderCallback; import com.android.tv.util.ImageLoader.LoadTvInputLogoTask; import com.android.tv.util.TvInputManagerHelper; import com.android.tv.util.Utils; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/tv/onboarding/NewSourcesFragment.java b/src/com/android/tv/onboarding/NewSourcesFragment.java index e6b247a0..f3b077a7 100644 --- a/src/com/android/tv/onboarding/NewSourcesFragment.java +++ b/src/com/android/tv/onboarding/NewSourcesFragment.java @@ -30,8 +30,7 @@ import com.android.tv.common.ui.setup.SetupActionHelper; /** A fragment for new channel source info/setup. */ public class NewSourcesFragment extends Fragment { /** The action category. */ - public static final String ACTION_CATEOGRY = - "com.android.tv.onboarding.NewSourcesFragment"; + public static final String ACTION_CATEOGRY = "com.android.tv.onboarding.NewSourcesFragment"; /** An action to show the setup screen. */ public static final int ACTION_SETUP = 1; /** An action to close this fragment. */ diff --git a/src/com/android/tv/onboarding/SetupSourcesFragment.java b/src/com/android/tv/onboarding/SetupSourcesFragment.java index 3025538b..974caf3f 100644 --- a/src/com/android/tv/onboarding/SetupSourcesFragment.java +++ b/src/com/android/tv/onboarding/SetupSourcesFragment.java @@ -46,8 +46,7 @@ import java.util.List; /** A fragment for channel source info/setup. */ public class SetupSourcesFragment extends SetupMultiPaneFragment { /** The action category for the actions which is fired from this fragment. */ - public static final String ACTION_CATEGORY = - "com.android.tv.onboarding.SetupSourcesFragment"; + public static final String ACTION_CATEGORY = "com.android.tv..onboarding.SetupSourcesFragment"; /** An action to open the merchant collection. */ public static final int ACTION_ONLINE_STORE = 1; /** diff --git a/src/com/android/tv/onboarding/WelcomeFragment.java b/src/com/android/tv/onboarding/WelcomeFragment.java index 92b56e8d..8c119a8a 100644 --- a/src/com/android/tv/onboarding/WelcomeFragment.java +++ b/src/com/android/tv/onboarding/WelcomeFragment.java @@ -614,6 +614,7 @@ public class WelcomeFragment extends OnboardingFragment { mPageDescriptions = getResources().getStringArray(R.array.welcome_page_descriptions); } } + @Nullable @Override public View onCreateView( @@ -624,74 +625,82 @@ public class WelcomeFragment extends OnboardingFragment { mPagingIndicator = view.findViewById(android.support.v17.leanback.R.id.page_indicator); mStartButton = view.findViewById(android.support.v17.leanback.R.id.button_start); - mStartButton.setAccessibilityDelegate(new AccessibilityDelegate() { - @Override - public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) { - int type = event.getEventType(); - if (type == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED - || type == AccessibilityEvent.TYPE_VIEW_FOCUSED) { - if (!mTitleChanged || mTitleView.isAccessibilityFocused()) { - // Skip the event before the title is accessibility focused to avoid race - // conditions - return; + mStartButton.setAccessibilityDelegate( + new AccessibilityDelegate() { + @Override + public void onInitializeAccessibilityEvent( + View host, AccessibilityEvent event) { + int type = event.getEventType(); + if (type == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED + || type == AccessibilityEvent.TYPE_VIEW_FOCUSED) { + if (!mTitleChanged || mTitleView.isAccessibilityFocused()) { + // Skip the event before the title is accessibility focused to avoid + // race + // conditions + return; + } + } + super.onInitializeAccessibilityEvent(host, event); } - } - super.onInitializeAccessibilityEvent(host, event); - } - }); - - mPagingIndicator.setAccessibilityDelegate(new AccessibilityDelegate() { - @Override - public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) { - int type = event.getEventType(); - if (type == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED - || type == AccessibilityEvent.TYPE_VIEW_FOCUSED) { - if (!mTitleChanged || mTitleView.isAccessibilityFocused()) { - // Skip the event before the title is accessibility focused to avoid race - // conditions - return; + }); + + mPagingIndicator.setAccessibilityDelegate( + new AccessibilityDelegate() { + @Override + public void onInitializeAccessibilityEvent( + View host, AccessibilityEvent event) { + int type = event.getEventType(); + if (type == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED + || type == AccessibilityEvent.TYPE_VIEW_FOCUSED) { + if (!mTitleChanged || mTitleView.isAccessibilityFocused()) { + // Skip the event before the title is accessibility focused to avoid + // race + // conditions + return; + } + } + super.onInitializeAccessibilityEvent(host, event); } - } - super.onInitializeAccessibilityEvent(host, event); - } - }); - - mTitleView.setAccessibilityDelegate(new AccessibilityDelegate() { - @Override - public boolean performAccessibilityAction(View host, int action, Bundle args) { - if (action == ACTION_CLEAR_ACCESSIBILITY_FOCUS) { - if (!mTitleChanged || mTitleView.isAccessibilityFocused()) { - // Skip the event before the title is accessibility focused to avoid race - // conditions - return false; + }); + + mTitleView.setAccessibilityDelegate( + new AccessibilityDelegate() { + @Override + public boolean performAccessibilityAction(View host, int action, Bundle args) { + if (action == ACTION_CLEAR_ACCESSIBILITY_FOCUS) { + if (!mTitleChanged || mTitleView.isAccessibilityFocused()) { + // Skip the event before the title is accessibility focused to avoid + // race + // conditions + return false; + } + } + return super.performAccessibilityAction(host, action, args); } - } - return super.performAccessibilityAction(host, action, args); - } - }); + }); - mTitleView.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - mTitleChanged = false; - } + mTitleView.addTextChangedListener( + new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + mTitleChanged = false; + } - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) {} - @Override - public void afterTextChanged(Editable s) { - if (!mTitleView.isAccessibilityFocused()) { - mTitleView.performAccessibilityAction( - AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null); - } else { - mTitleView.sendAccessibilityEvent( - AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED); - } - mTitleChanged = true; - } - }); + @Override + public void afterTextChanged(Editable s) { + if (!mTitleView.isAccessibilityFocused()) { + mTitleView.performAccessibilityAction( + AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null); + } else { + mTitleView.sendAccessibilityEvent( + AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED); + } + mTitleChanged = true; + } + }); return view; } diff --git a/src/com/android/tv/receiver/PackageIntentsReceiver.java b/src/com/android/tv/receiver/PackageIntentsReceiver.java index 3958f6bf..bd3f888c 100644 --- a/src/com/android/tv/receiver/PackageIntentsReceiver.java +++ b/src/com/android/tv/receiver/PackageIntentsReceiver.java @@ -24,9 +24,9 @@ import android.util.Log; import com.android.tv.Starter; import com.android.tv.TvFeatures; import com.android.tv.TvSingletons; - import com.android.tv.util.Partner; + /** A class for handling the broadcast intents from PackageManager. */ public class PackageIntentsReceiver extends BroadcastReceiver { private static final String TAG = "PackageIntentsReceiver"; diff --git a/src/com/android/tv/recommendation/NotificationService.java b/src/com/android/tv/recommendation/NotificationService.java index 201bb103..4222affb 100644 --- a/src/com/android/tv/recommendation/NotificationService.java +++ b/src/com/android/tv/recommendation/NotificationService.java @@ -44,6 +44,7 @@ import com.android.tv.MainActivityWrapper.OnCurrentChannelChangeListener; import com.android.tv.R; import com.android.tv.Starter; import com.android.tv.TvSingletons; +import com.android.tv.common.CommonConstants; import com.android.tv.common.WeakHandler; import com.android.tv.data.Channel; import com.android.tv.data.Program; @@ -62,16 +63,16 @@ public class NotificationService extends Service private static final boolean DEBUG = false; public static final String ACTION_SHOW_RECOMMENDATION = - "com.android.tv.notification.ACTION_SHOW_RECOMMENDATION"; + CommonConstants.BASE_PACKAGE + ".notification.ACTION_SHOW_RECOMMENDATION"; public static final String ACTION_HIDE_RECOMMENDATION = - "com.android.tv.notification.ACTION_HIDE_RECOMMENDATION"; + CommonConstants.BASE_PACKAGE + ".notification.ACTION_HIDE_RECOMMENDATION"; /** * Recommendation intent has an extra data for the recommendation type. It'll be also sent to a * TV input as a tune parameter. */ public static final String TUNE_PARAMS_RECOMMENDATION_TYPE = - "com.android.tv.recommendation_type"; + CommonConstants.BASE_PACKAGE + ".recommendation_type"; private static final String TYPE_RANDOM_RECOMMENDATION = "random"; private static final String TYPE_ROUTINE_WATCH_RECOMMENDATION = "routine_watch"; diff --git a/src/com/android/tv/search/LocalSearchProvider.java b/src/com/android/tv/search/LocalSearchProvider.java index 579811e7..96944bf4 100644 --- a/src/com/android/tv/search/LocalSearchProvider.java +++ b/src/com/android/tv/search/LocalSearchProvider.java @@ -28,6 +28,7 @@ import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import com.android.tv.TvSingletons; +import com.android.tv.common.CommonConstants; import com.android.tv.common.SoftPreconditions; import com.android.tv.common.util.CommonUtils; import com.android.tv.common.util.PermissionUtils; @@ -44,7 +45,7 @@ public class LocalSearchProvider extends ContentProvider { private static final boolean DEBUG = false; /** The authority for LocalSearchProvider. */ - public static final String AUTHORITY = "com.android.tv.search"; + public static final String AUTHORITY = CommonConstants.BASE_PACKAGE + ".search"; public static final int PROGRESS_PERCENTAGE_HIDE = -1; diff --git a/src/com/android/tv/tuner/TunerInputController.java b/src/com/android/tv/tuner/TunerInputController.java index 02611bbf..e3fa5e89 100644 --- a/src/com/android/tv/tuner/TunerInputController.java +++ b/src/com/android/tv/tuner/TunerInputController.java @@ -81,10 +81,10 @@ public class TunerInputController { /** Action of {@link Intent} to check network connection repeatedly when it is necessary. */ private static final String CHECKING_NETWORK_TUNER_STATUS = - "com.android.tv.action.CHECKING_NETWORK_TUNER_STATUS"; + " com.android.tv.action.CHECKING_NETWORK_TUNER_STATUS"; private static final String EXTRA_CHECKING_DURATION = - "com.android.tv.action.extra.CHECKING_DURATION"; + " com.android.tv.action.extra.CHECKING_DURATION"; private static final String EXTRA_DEVICE_IP = "com.android.tv.action.extra.DEVICE_IP"; private static final long INITIAL_CHECKING_DURATION_MS = TimeUnit.SECONDS.toMillis(10); diff --git a/src/com/android/tv/ui/TunableTvView.java b/src/com/android/tv/ui/TunableTvView.java index 36de790f..f1e72afb 100644 --- a/src/com/android/tv/ui/TunableTvView.java +++ b/src/com/android/tv/ui/TunableTvView.java @@ -64,6 +64,7 @@ import com.android.tv.TvFeatures; import com.android.tv.TvSingletons; import com.android.tv.analytics.Tracker; import com.android.tv.common.BuildConfig; +import com.android.tv.common.CommonConstants; import com.android.tv.common.feature.CommonFeatures; import com.android.tv.common.util.CommonUtils; import com.android.tv.common.util.Debug; @@ -103,7 +104,7 @@ public class TunableTvView extends FrameLayout implements StreamInfo { public static final int BLOCK_SCREEN_TYPE_NORMAL = 2; private static final String PERMISSION_RECEIVE_INPUT_EVENT = - "com.android.tv.permission.RECEIVE_INPUT_EVENT"; + CommonConstants.BASE_PACKAGE + ".permission.RECEIVE_INPUT_EVENT"; @Retention(RetentionPolicy.SOURCE) @IntDef({ diff --git a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java index dd42a728..36ee5a2d 100644 --- a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java +++ b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java @@ -21,16 +21,16 @@ import android.app.Activity; import android.support.annotation.NonNull; import android.util.Log; import android.widget.Toast; - - - - import com.android.tv.R; import com.android.tv.TvSingletons; import com.android.tv.common.CommonPreferences; import com.android.tv.common.feature.CommonFeatures; import com.android.tv.common.util.CommonUtils; + + + + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/tv/util/OnboardingUtils.java b/src/com/android/tv/util/OnboardingUtils.java index 63383aab..3b72e091 100644 --- a/src/com/android/tv/util/OnboardingUtils.java +++ b/src/com/android/tv/util/OnboardingUtils.java @@ -48,8 +48,8 @@ public final class OnboardingUtils { } /** - * Checks if this is the first run of {@link com.android.tv.MainActivity} with the - * current onboarding version. + * Checks if this is the first run of {@link com.android.tv.MainActivity} with the current + * onboarding version. */ public static boolean isFirstRunWithCurrentVersion(Context context) { int versionCode = @@ -59,8 +59,8 @@ public final class OnboardingUtils { } /** - * Marks that the first run of {@link com.android.tv.MainActivity} with the current - * onboarding version has been completed. + * Marks that the first run of {@link com.android.tv.MainActivity} with the current onboarding + * version has been completed. */ public static void setFirstRunWithCurrentVersionCompleted(Context context) { PreferenceManager.getDefaultSharedPreferences(context) |