1 files changed, 42 insertions, 41 deletions

diff --git a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
index f633fa5a..36ee5a2d 100644
--- a/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
+++ b/src/com/android/tv/ui/sidepanel/DeveloperOptionFragment.java
@@ -21,22 +21,20 @@ 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.TvApplication;
-import com.android.tv.common.BuildConfig;
+import com.android.tv.TvSingletons;
+import com.android.tv.common.CommonPreferences;
 import com.android.tv.common.feature.CommonFeatures;
-import com.android.tv.data.epg.EpgFetcher;
-import com.android.tv.experiments.Experiments;
-import com.android.tv.tuner.TunerPreferences;
-import com.android.tv.util.Utils;
+import com.android.tv.common.util.CommonUtils;
+
+
+
+
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Options for developers only
- */
+/** Options for developers only */
 public class DeveloperOptionFragment extends SideFragment {
     private static final String TAG = "DeveloperOptionFragment";
     private static final String TRACKER_LABEL = "debug options";
@@ -55,42 +53,46 @@ public class DeveloperOptionFragment extends SideFragment {
     protected List<Item> getItemList() {
         List<Item> items = new ArrayList<>();
         if (CommonFeatures.DVR.isEnabled(getContext())) {
-            items.add(new ActionItem(getString(R.string.dev_item_dvr_history)) {
-                @Override
-                protected void onSelected() {
-                    getMainActivity().getOverlayManager().showDvrHistoryDialog();
-                }
-            });
+            items.add(
+                    new ActionItem(getString(R.string.dev_item_dvr_history)) {
+                        @Override
+                        protected void onSelected() {
+                            getMainActivity().getOverlayManager().showDvrHistoryDialog();
+                        }
+                    });
         }
-        if (Utils.isDeveloper()) {
-            items.add(new ActionItem(getString(R.string.dev_item_watch_history)) {
-                @Override
-                protected void onSelected() {
-                    getMainActivity().getOverlayManager().showRecentlyWatchedDialog();
-                }
-            });
+        if (CommonUtils.isDeveloper()) {
+            items.add(
+                    new ActionItem(getString(R.string.dev_item_watch_history)) {
+                        @Override
+                        protected void onSelected() {
+                            getMainActivity().getOverlayManager().showRecentlyWatchedDialog();
+                        }
+                    });
         }
-        items.add(new SwitchItem(getString(R.string.dev_item_store_ts_on),
-                getString(R.string.dev_item_store_ts_off),
-                getString(R.string.dev_item_store_ts_description)) {
-            @Override
-            protected void onUpdate() {
-                super.onUpdate();
-                setChecked(TunerPreferences.getStoreTsStream(getContext()));
-            }
+        items.add(
+                new SwitchItem(
+                        getString(R.string.dev_item_store_ts_on),
+                        getString(R.string.dev_item_store_ts_off),
+                        getString(R.string.dev_item_store_ts_description)) {
+                    @Override
+                    protected void onUpdate() {
+                        super.onUpdate();
+                        setChecked(CommonPreferences.getStoreTsStream(getContext()));
+                    }
 
-            @Override
-            protected void onSelected() {
-                super.onSelected();
-                TunerPreferences.setStoreTsStream(getContext(), isChecked());
-            }
-        });
-        if (Utils.isDeveloper()) {
+                    @Override
+                    protected void onSelected() {
+                        super.onSelected();
+                        CommonPreferences.setStoreTsStream(getContext(), isChecked());
+                    }
+                });
+        if (CommonUtils.isDeveloper()) {
             items.add(
                     new ActionItem(getString(R.string.dev_item_show_performance_monitor_log)) {
                         @Override
                         protected void onSelected() {
-                            TvApplication.getSingletons(getContext())
+                            TvSingletons.getSingletons(getContext())
                                     .getPerformanceMonitor()
                                     .startPerformanceMonitorEventDebugActivity(getContext());
                         }
@@ -98,5 +100,4 @@ public class DeveloperOptionFragment extends SideFragment {
         }
         return items;
     }
-
-}
\ No newline at end of file
+}