# HG changeset patch # User Xeli # Date 1319144873 -7200 # Node ID 7bc38086d771907581729bc463506b846457b9cf # Parent 10011f051f9cc5d8405f220610f64e1b70614447 wops missed this one: removed a 'fix' eclipse put in there diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadActivity.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadActivity.java Thu Oct 20 23:07:53 2011 +0200 @@ -20,7 +20,7 @@ package org.hedgewars.hedgeroid.Downloader; import org.hedgewars.hedgeroid.MainActivity; -import org.hedgewars.mobile.R; +import org.hedgewars.hedgeroid.R; import android.app.Activity; import android.content.ComponentName; @@ -33,13 +33,11 @@ import android.os.Message; import android.os.Messenger; import android.os.RemoteException; -import android.preference.PreferenceManager; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; -import android.widget.Toast; public class DownloadActivity extends Activity{ private Messenger messageService; diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadService.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadService.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadService.java Thu Oct 20 23:07:53 2011 +0200 @@ -22,8 +22,8 @@ import java.util.ArrayList; import org.hedgewars.hedgeroid.MainActivity; +import org.hedgewars.hedgeroid.R; import org.hedgewars.hedgeroid.Utils; -import org.hedgewars.mobile.R; import android.app.Notification; import android.app.NotificationManager; diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java Thu Oct 20 23:07:53 2011 +0200 @@ -25,9 +25,9 @@ import java.util.Collections; import java.util.HashMap; +import org.hedgewars.hedgeroid.R; import org.hedgewars.hedgeroid.Utils; import org.hedgewars.hedgeroid.EngineProtocol.Map.MapType; -import org.hedgewars.mobile.R; import android.content.Context; import android.graphics.Bitmap; diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java Thu Oct 20 23:07:53 2011 +0200 @@ -20,7 +20,6 @@ import org.hedgewars.hedgeroid.Downloader.DownloadActivity; import org.hedgewars.hedgeroid.Downloader.DownloadService; -import org.hedgewars.mobile.R; import android.app.Activity; import android.content.Intent; diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java Thu Oct 20 23:07:53 2011 +0200 @@ -25,7 +25,6 @@ import org.hedgewars.hedgeroid.EngineProtocol.Scheme; import org.hedgewars.hedgeroid.EngineProtocol.Team; import org.hedgewars.hedgeroid.EngineProtocol.Weapon; -import org.hedgewars.mobile.R; import android.app.Activity; import android.content.Intent; diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java Thu Oct 20 23:07:53 2011 +0200 @@ -28,7 +28,6 @@ import org.hedgewars.hedgeroid.EngineProtocol.FrontendDataUtils; import org.hedgewars.hedgeroid.EngineProtocol.Team; -import org.hedgewars.mobile.R; import android.app.Activity; import android.graphics.Bitmap; diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamSelectionActivity.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamSelectionActivity.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamSelectionActivity.java Thu Oct 20 23:07:53 2011 +0200 @@ -25,7 +25,6 @@ import org.hedgewars.hedgeroid.EngineProtocol.FrontendDataUtils; import org.hedgewars.hedgeroid.EngineProtocol.Team; -import org.hedgewars.mobile.R; import android.app.Activity; import android.content.Intent; diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TextImageAdapter.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TextImageAdapter.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TextImageAdapter.java Thu Oct 20 23:07:53 2011 +0200 @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.Map; -import org.hedgewars.mobile.R; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff -r 10011f051f9c -r 7bc38086d771 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Utils.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Utils.java Thu Oct 20 22:54:34 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Utils.java Thu Oct 20 23:07:53 2011 +0200 @@ -26,8 +26,6 @@ import java.io.InputStream; import java.util.ArrayList; -import org.hedgewars.mobile.R; - import android.content.Context; import android.content.res.TypedArray; import android.os.Build;