From bb7f8c67534ee4448d51a1f08cd428dd6a42f5ef Mon Sep 17 00:00:00 2001 From: Eder Bastos Date: Tue, 12 May 2015 19:45:13 -0400 Subject: [PATCH] Move AssetCopyService to the services package. --- Source/Android/app/src/main/AndroidManifest.xml | 2 +- .../dolphinemu/dolphinemu/activities/GameGridActivity.java | 2 +- .../org/dolphinemu/dolphinemu/gamelist/GameListActivity.java | 3 +-- .../dolphinemu/{ => services}/AssetCopyService.java | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ => services}/AssetCopyService.java (97%) diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index 6bbb272dc3..59572aa380 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -60,7 +60,7 @@ android:label="@string/settings" android:theme="@android:style/Theme.Holo.Light" /> - + diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java index f4f4519b94..15bbb44fff 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java @@ -14,12 +14,12 @@ import android.view.View; import android.widget.ImageButton; import android.widget.Toolbar; -import org.dolphinemu.dolphinemu.AssetCopyService; import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.adapters.GameAdapter; import org.dolphinemu.dolphinemu.model.Game; import org.dolphinemu.dolphinemu.model.GcGame; +import org.dolphinemu.dolphinemu.services.AssetCopyService; import java.io.File; import java.util.ArrayList; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java index 3accec11de..06b236da82 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java @@ -20,7 +20,6 @@ import android.os.Environment; import android.preference.PreferenceManager; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.widget.DrawerLayout; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -28,12 +27,12 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ListView; -import org.dolphinemu.dolphinemu.AssetCopyService; import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.about.AboutActivity; import org.dolphinemu.dolphinemu.emulation.EmulationActivity; import org.dolphinemu.dolphinemu.folderbrowser.FolderBrowser; +import org.dolphinemu.dolphinemu.services.AssetCopyService; import org.dolphinemu.dolphinemu.settings.PrefsActivity; import org.dolphinemu.dolphinemu.sidemenu.SideMenuAdapter; import org.dolphinemu.dolphinemu.sidemenu.SideMenuItem; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/AssetCopyService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java similarity index 97% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/AssetCopyService.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java index d39bbec59f..f538e8e251 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/AssetCopyService.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/AssetCopyService.java @@ -4,13 +4,13 @@ * Refer to the license.txt file included. */ -package org.dolphinemu.dolphinemu; +package org.dolphinemu.dolphinemu.services; import android.app.IntentService; import android.content.Intent; -import android.os.Environment; import android.util.Log; +import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.settings.UserPreferences; import java.io.File;