From e34abd5739142b7fec3a4480d22d2335e7d20ae9 Mon Sep 17 00:00:00 2001 From: sigmabeta Date: Sun, 10 Jan 2016 12:10:02 -0500 Subject: [PATCH] Move TvMainActivity to ui.main package --- Source/Android/app/src/main/AndroidManifest.xml | 2 +- .../dolphinemu/{activities => ui/main}/TvMainActivity.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{activities => ui/main}/TvMainActivity.java (96%) diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index 0d83b3a37d..a6a7ecc888 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -39,7 +39,7 @@ diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java similarity index 96% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java index 6d580eaafb..27ccfa2f9d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/TvMainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.activities; +package org.dolphinemu.dolphinemu.ui.main; import android.app.Activity; import android.app.ActivityOptions; @@ -19,12 +19,13 @@ import android.support.v17.leanback.widget.Row; import android.support.v17.leanback.widget.RowPresenter; import org.dolphinemu.dolphinemu.R; +import org.dolphinemu.dolphinemu.activities.AddDirectoryActivity; +import org.dolphinemu.dolphinemu.activities.EmulationActivity; +import org.dolphinemu.dolphinemu.activities.SettingsActivity; import org.dolphinemu.dolphinemu.adapters.GameRowPresenter; import org.dolphinemu.dolphinemu.adapters.SettingsRowPresenter; import org.dolphinemu.dolphinemu.model.Game; import org.dolphinemu.dolphinemu.model.TvSettingsItem; -import org.dolphinemu.dolphinemu.ui.main.MainPresenter; -import org.dolphinemu.dolphinemu.ui.main.MainView; import org.dolphinemu.dolphinemu.utils.StartupHandler; import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;