Move side panel related stuffs into android.tv.ui.sidepanel

Change-Id: Ied8b97f47a53971d479e8a5f64cf87e674cd770f

13 files changed, 22 insertions, 29 deletions

diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java
index 7e0db437..d0919bb2 100644
--- a/src/com/android/tv/TvActivity.java
+++ b/src/com/android/tv/TvActivity.java
@@ -63,20 +63,20 @@ import com.android.tv.dialog.RecentlyWatchedDialogFragment;
 import com.android.tv.input.TisTvInput;
 import com.android.tv.input.TvInput;
 import com.android.tv.input.UnifiedTvInput;
-import com.android.tv.ui.BaseSideFragment;
 import com.android.tv.ui.ChannelBannerView;
 import com.android.tv.ui.ChannelNumberView;
-import com.android.tv.ui.ClosedCaptionOptionFragment;
-import com.android.tv.ui.DebugOptionFragment;
-import com.android.tv.ui.DisplayModeOptionFragment;
-import com.android.tv.ui.EditChannelsFragment;
-import com.android.tv.ui.InputPickerFragment;
 import com.android.tv.ui.MainMenuView;
-import com.android.tv.ui.PipLocationFragment;
-import com.android.tv.ui.SidePanelContainer;
-import com.android.tv.ui.SimpleGuideFragment;
 import com.android.tv.ui.TunableTvView;
 import com.android.tv.ui.TunableTvView.OnTuneListener;
+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.EditChannelsFragment;
+import com.android.tv.ui.sidepanel.InputPickerFragment;
+import com.android.tv.ui.sidepanel.PipLocationFragment;
+import com.android.tv.ui.sidepanel.SidePanelContainer;
+import com.android.tv.ui.sidepanel.SimpleGuideFragment;
 import com.android.tv.util.TvInputManagerHelper;
 import com.android.tv.util.TvSettings;
 import com.android.tv.util.Utils;
diff --git a/src/com/android/tv/ui/MainMenuView.java b/src/com/android/tv/ui/MainMenuView.java
index c0108e4e..89e4346a 100644
--- a/src/com/android/tv/ui/MainMenuView.java
+++ b/src/com/android/tv/ui/MainMenuView.java
@@ -37,6 +37,7 @@ import com.android.tv.data.Channel;
 import com.android.tv.data.ChannelMap;
 import com.android.tv.recommendation.RecentChannelRecommender;
 import com.android.tv.recommendation.TvRecommendation;
+import com.android.tv.ui.sidepanel.BaseSideFragment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/tv/ui/BaseOptionFragment.java b/src/com/android/tv/ui/sidepanel/BaseOptionFragment.java
index c7d5a0c9..b8d45acc 100644
--- a/src/com/android/tv/ui/BaseOptionFragment.java
+++ b/src/com/android/tv/ui/sidepanel/BaseOptionFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
diff --git a/src/com/android/tv/ui/BaseSideFragment.java b/src/com/android/tv/ui/sidepanel/BaseSideFragment.java
index 090fcd36..5b5343b0 100644
--- a/src/com/android/tv/ui/BaseSideFragment.java
+++ b/src/com/android/tv/ui/sidepanel/BaseSideFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.app.Fragment;
 import android.os.Bundle;
diff --git a/src/com/android/tv/ui/ClosedCaptionOptionFragment.java b/src/com/android/tv/ui/sidepanel/ClosedCaptionOptionFragment.java
index df1d934d..3db185ff 100644
--- a/src/com/android/tv/ui/ClosedCaptionOptionFragment.java
+++ b/src/com/android/tv/ui/sidepanel/ClosedCaptionOptionFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
diff --git a/src/com/android/tv/ui/DebugOptionFragment.java b/src/com/android/tv/ui/sidepanel/DebugOptionFragment.java
index 0b6f7bd8..70641361 100644
--- a/src/com/android/tv/ui/DebugOptionFragment.java
+++ b/src/com/android/tv/ui/sidepanel/DebugOptionFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
diff --git a/src/com/android/tv/ui/DisplayModeOptionFragment.java b/src/com/android/tv/ui/sidepanel/DisplayModeOptionFragment.java
index d132fbc2..43b446d4 100644
--- a/src/com/android/tv/ui/DisplayModeOptionFragment.java
+++ b/src/com/android/tv/ui/sidepanel/DisplayModeOptionFragment.java
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 import com.android.tv.R;
 import com.android.tv.TvActivity;
diff --git a/src/com/android/tv/ui/EditChannelsFragment.java b/src/com/android/tv/ui/sidepanel/EditChannelsFragment.java
index 473bd308..48d21fd3 100644
--- a/src/com/android/tv/ui/EditChannelsFragment.java
+++ b/src/com/android/tv/ui/sidepanel/EditChannelsFragment.java
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.content.ContentValues;
 import android.media.tv.TvContract;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v17.leanback.widget.VerticalGridView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/com/android/tv/ui/InputPickerFragment.java b/src/com/android/tv/ui/sidepanel/InputPickerFragment.java
index 382ed113..8a05cc1e 100644
--- a/src/com/android/tv/ui/InputPickerFragment.java
+++ b/src/com/android/tv/ui/sidepanel/InputPickerFragment.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
-
-import static android.media.tv.TvInputManager.INPUT_STATE_DISCONNECTED;
+package com.android.tv.ui.sidepanel;
 
 import android.media.tv.TvInputInfo;
 import android.media.tv.TvInputManager;
@@ -98,7 +96,7 @@ public class InputPickerFragment extends BaseOptionFragment {
     public void onBindView(View v, int position, Object tag, boolean prevSelected) {
         super.onBindView(v, position, tag, prevSelected);
         TvInput input = (TvInput) tag;
-        boolean available = input.getInputState() != INPUT_STATE_DISCONNECTED;
+        boolean available = input.getInputState() != TvInputManager.INPUT_STATE_DISCONNECTED;
         v.setEnabled(available);
         v.setClickable(available);
 
diff --git a/src/com/android/tv/ui/PipLocationFragment.java b/src/com/android/tv/ui/sidepanel/PipLocationFragment.java
index f0d09c78..23c97274 100644
--- a/src/com/android/tv/ui/PipLocationFragment.java
+++ b/src/com/android/tv/ui/sidepanel/PipLocationFragment.java
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.os.Bundle;
-import android.util.Log;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.Toast;
 
 import com.android.tv.R;
 import com.android.tv.TvActivity;
diff --git a/src/com/android/tv/ui/SidePanelContainer.java b/src/com/android/tv/ui/sidepanel/SidePanelContainer.java
index 3a7c4da9..ada85f1b 100644
--- a/src/com/android/tv/ui/SidePanelContainer.java
+++ b/src/com/android/tv/ui/sidepanel/SidePanelContainer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/tv/ui/SimpleGuideFragment.java b/src/com/android/tv/ui/sidepanel/SimpleGuideFragment.java
index b9f73b26..5f036a4e 100644
--- a/src/com/android/tv/ui/SimpleGuideFragment.java
+++ b/src/com/android/tv/ui/sidepanel/SimpleGuideFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.app.FragmentTransaction;
 import android.content.ContentUris;
diff --git a/src/com/android/tv/ui/SimpleGuideShowOnlyFragment.java b/src/com/android/tv/ui/sidepanel/SimpleGuideShowOnlyFragment.java
index 89214a3d..db3f88d3 100644
--- a/src/com/android/tv/ui/SimpleGuideShowOnlyFragment.java
+++ b/src/com/android/tv/ui/sidepanel/SimpleGuideShowOnlyFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tv.ui;
+package com.android.tv.ui.sidepanel;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -24,7 +24,6 @@ import android.view.ViewGroup;
 import android.widget.RadioButton;
 
 import com.android.tv.R;
-import com.android.tv.TvActivity;
 import com.android.tv.data.GenreItems;
 
 public class SimpleGuideShowOnlyFragment extends BaseSideFragment {