1 files changed, 18 insertions, 9 deletions
diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java
index b41d8e8d..23cb4596 100644
--- a/src/com/android/tv/TvActivity.java
+++ b/src/com/android/tv/TvActivity.java
@@ -70,15 +70,19 @@ import com.android.tv.ui.KeypadView;
 import com.android.tv.ui.MainMenuView;
 import com.android.tv.ui.TunableTvView;
 import com.android.tv.ui.TunableTvView.OnTuneListener;
+import com.android.tv.ui.sidepanel.ActionItem;
 import com.android.tv.ui.sidepanel.BaseSideFragment;
-import com.android.tv.ui.sidepanel.ClosedCaptionOptionFragment;
-import com.android.tv.ui.sidepanel.DebugOptionFragment;
-import com.android.tv.ui.sidepanel.DisplayModeOptionFragment;
+import com.android.tv.ui.sidepanel.ClosedCaptionFragment;
+import com.android.tv.ui.sidepanel.DisplayModeFragment;
 import com.android.tv.ui.sidepanel.EditChannelsFragment;
 import com.android.tv.ui.sidepanel.InputPickerFragment;
+import com.android.tv.ui.sidepanel.Item;
 import com.android.tv.ui.sidepanel.PipLocationFragment;
+import com.android.tv.ui.sidepanel.RadioButtonItem;
+import com.android.tv.ui.sidepanel.SideFragment;
 import com.android.tv.ui.sidepanel.SidePanelContainer;
 import com.android.tv.ui.sidepanel.SimpleGuideFragment;
+import com.android.tv.ui.sidepanel.SubMenuItem;
 import com.android.tv.util.TvInputManagerHelper;
 import com.android.tv.util.TvSettings;
 import com.android.tv.util.Utils;
@@ -563,11 +567,11 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
     }
 
     public void showDisplayModeOption(int initiator) {
-        showSideFragment(new DisplayModeOptionFragment(), initiator);
+        showSideFragment(new DisplayModeFragment(), initiator);
     }
 
     public void showClosedCaptionOption(int initiator) {
-        showSideFragment(new ClosedCaptionOptionFragment(), initiator);
+        showSideFragment(new ClosedCaptionFragment(), initiator);
     }
 
     public void showPipLocationOption(int initiator) {
@@ -575,13 +579,18 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
     }
 
     public void showDebugOptions(int initiator) {
-        showSideFragment(new DebugOptionFragment() {
+        showSideFragment(new SideFragment() {
             @Override
-            protected List<Item> buildItems() {
+            protected String getTitle() {
+                return getString(R.string.menu_debug_options);
+            }
+
+            @Override
+            protected List<Item> getItemList() {
                 List<Item> items = new ArrayList<>();
                 items.add(new SubMenuItem(getString(R.string.item_tv_input), getFragmentManager()) {
                     @Override
-                    protected List<Item> buildItems() {
+                    protected List<Item> getItemList() {
                         return getTvInputMenu();
                     }
                 });
@@ -1239,7 +1248,7 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha
                 }
 
                 case KeyEvent.KEYCODE_D:
-                    showDebugOptions(BaseSideFragment.INITIATOR_UNKNOWN);
+                    showDebugOptions(BaseSideFragment.INITIATOR_SHORTCUT_KEY);
                     return true;
 
                 case KeyEvent.KEYCODE_K: