diff --git a/vtm-android-example/res/values/strings.xml b/vtm-android-example/res/values/strings.xml index fe1ea541..84ff39a2 100644 --- a/vtm-android-example/res/values/strings.xml +++ b/vtm-android-example/res/values/strings.xml @@ -28,7 +28,7 @@ void or value Now Warning - To run this sample activity, you need an MBTiles database installed on storage.\n\nadb push %s %s + To run this sample activity, you need an MBTiles database installed on storage. Exit Replace fragment This is a fragment to test the back stack behaviour of the map fragment. diff --git a/vtm-android-example/src/org/oscim/android/filepicker/FilePicker.java b/vtm-android-example/src/org/oscim/android/filepicker/FilePicker.java index 55b8e01c..d664b0f0 100755 --- a/vtm-android-example/src/org/oscim/android/filepicker/FilePicker.java +++ b/vtm-android-example/src/org/oscim/android/filepicker/FilePicker.java @@ -192,6 +192,7 @@ public class FilePicker extends Activity implements AdapterView.OnItemClickListe // } } + @SuppressWarnings("deprecation") @Override protected Dialog onCreateDialog(int id) { AlertDialog.Builder builder = new AlertDialog.Builder(this); diff --git a/vtm-android-example/src/org/oscim/android/test/BlankFragment.java b/vtm-android-example/src/org/oscim/android/test/BlankFragment.java index ae175cce..28bc98f9 100644 --- a/vtm-android-example/src/org/oscim/android/test/BlankFragment.java +++ b/vtm-android-example/src/org/oscim/android/test/BlankFragment.java @@ -14,14 +14,13 @@ */ package org.oscim.android.test; -import android.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @SuppressWarnings("deprecation") -public class BlankFragment extends Fragment { +public class BlankFragment extends android.app.Fragment { static BlankFragment newInstance() { BlankFragment instance = new BlankFragment(); diff --git a/vtm-android-example/src/org/oscim/android/test/FragmentActivity.java b/vtm-android-example/src/org/oscim/android/test/FragmentActivity.java index 8e0a63a2..32548606 100644 --- a/vtm-android-example/src/org/oscim/android/test/FragmentActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/FragmentActivity.java @@ -15,15 +15,13 @@ package org.oscim.android.test; import android.app.Activity; -import android.app.Fragment; -import android.app.FragmentTransaction; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; +@SuppressWarnings("deprecation") public class FragmentActivity extends Activity { - @SuppressWarnings("deprecation") @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -32,8 +30,8 @@ public class FragmentActivity extends Activity { setTitle(getClass().getSimpleName()); if (savedInstanceState == null) { - Fragment mapFragment = MapFragment.newInstance(); - FragmentTransaction ft = getFragmentManager().beginTransaction(); + android.app.Fragment mapFragment = MapFragment.newInstance(); + android.app.FragmentTransaction ft = getFragmentManager().beginTransaction(); ft.add(R.id.fragment_container, mapFragment).commit(); } } @@ -44,12 +42,11 @@ public class FragmentActivity extends Activity { return true; } - @SuppressWarnings("deprecation") @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.replace_fragment) { - Fragment blankFragment = BlankFragment.newInstance(); - FragmentTransaction ft = getFragmentManager().beginTransaction(); + android.app.Fragment blankFragment = BlankFragment.newInstance(); + android.app.FragmentTransaction ft = getFragmentManager().beginTransaction(); ft.replace(R.id.fragment_container, blankFragment); ft.addToBackStack(null); ft.commit(); diff --git a/vtm-android-example/src/org/oscim/android/test/LocationActivity.java b/vtm-android-example/src/org/oscim/android/test/LocationActivity.java index 43c8903f..f7a3edbd 100644 --- a/vtm-android-example/src/org/oscim/android/test/LocationActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/LocationActivity.java @@ -96,6 +96,7 @@ public class LocationActivity extends BitmapTileActivity implements LocationList public void onProviderEnabled(String provider) { } + @SuppressWarnings("deprecation") @Override public void onStatusChanged(String provider, int status, Bundle extras) { } diff --git a/vtm-android-example/src/org/oscim/android/test/LocationTextureActivity.java b/vtm-android-example/src/org/oscim/android/test/LocationTextureActivity.java index 4ee519af..32bcdfb0 100644 --- a/vtm-android-example/src/org/oscim/android/test/LocationTextureActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/LocationTextureActivity.java @@ -126,6 +126,7 @@ public class LocationTextureActivity extends BitmapTileActivity implements Locat public void onProviderEnabled(String provider) { } + @SuppressWarnings("deprecation") @Override public void onStatusChanged(String provider, int status, Bundle extras) { } diff --git a/vtm-android-example/src/org/oscim/android/test/MBTilesBitmapActivity.java b/vtm-android-example/src/org/oscim/android/test/MBTilesBitmapActivity.java index e49b0abf..16d615c6 100644 --- a/vtm-android-example/src/org/oscim/android/test/MBTilesBitmapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MBTilesBitmapActivity.java @@ -41,7 +41,7 @@ public class MBTilesBitmapActivity extends BitmapTileActivity { if (!file.exists()) { AlertDialog.Builder builder = new AlertDialog.Builder(this) .setTitle(R.string.warning) - .setMessage(getResources().getString(R.string.startup_message_mbtiles, file.getName(), file.getAbsolutePath())) + .setMessage(getResources().getString(R.string.startup_message_mbtiles)) .setPositiveButton(R.string.exit, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/vtm-android-example/src/org/oscim/android/test/MBTilesMvtActivity.java b/vtm-android-example/src/org/oscim/android/test/MBTilesMvtActivity.java index c5b4a31b..413fb97f 100644 --- a/vtm-android-example/src/org/oscim/android/test/MBTilesMvtActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/MBTilesMvtActivity.java @@ -45,7 +45,7 @@ public class MBTilesMvtActivity extends MapActivity { if (!file.exists()) { AlertDialog.Builder builder = new AlertDialog.Builder(this) .setTitle(R.string.warning) - .setMessage(getResources().getString(R.string.startup_message_mbtiles, file.getName(), file.getAbsolutePath())) + .setMessage(getResources().getString(R.string.startup_message_mbtiles)) .setPositiveButton(R.string.exit, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/vtm-android-example/src/org/oscim/android/test/MapFragment.java b/vtm-android-example/src/org/oscim/android/test/MapFragment.java index 7b338ec1..4cd8475f 100644 --- a/vtm-android-example/src/org/oscim/android/test/MapFragment.java +++ b/vtm-android-example/src/org/oscim/android/test/MapFragment.java @@ -15,7 +15,6 @@ */ package org.oscim.android.test; -import android.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -40,7 +39,7 @@ import java.io.File; * You'll need a map with filename berlin.map from download.mapsforge.org in device storage. */ @SuppressWarnings("deprecation") -public class MapFragment extends Fragment { +public class MapFragment extends android.app.Fragment { private MapView mapView; private IRenderTheme theme; diff --git a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java index 0b31d3c2..7bbd86bf 100644 --- a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java @@ -18,7 +18,6 @@ package org.oscim.android.test; import android.content.Context; import android.content.Intent; import android.graphics.BitmapFactory; -import android.os.AsyncTask; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; @@ -58,6 +57,7 @@ import java.util.List; * Long press on map to search inside visible bounding box.
* Tap on POIs to show their name (in default locale). */ +@SuppressWarnings("deprecation") public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLayer.OnItemGestureListener { private static final Logger log = LoggerFactory.getLogger(PoiSearchActivity.class); @@ -275,7 +275,7 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye } } - private class PoiSearchTask extends AsyncTask> { + private class PoiSearchTask extends android.os.AsyncTask> { private final WeakReference weakActivity; private final String category; private final List patterns;