Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed rest of tracking usage. Fixed issue 956

Browse source
This commit is contained in:
Pavol Zibrita 2012-04-13 02:06:11 +02:00
parent ade929b0ff
commit d334fe34fa
10 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/.classpath
View file

@ -8,6 +8,5 @@
<classpathentry kind="lib" path="lib/tuprolog.jar"/> <classpathentry kind="lib" path="lib/tuprolog.jar"/>
<classpathentry kind="lib" path="lib/junidecode-0.1.jar"/> <classpathentry kind="lib" path="lib/junidecode-0.1.jar"/>
<classpathentry kind="lib" path="lib/bsh-core-2.0b4.jar"/> <classpathentry kind="lib" path="lib/bsh-core-2.0b4.jar"/>
<classpathentry kind="lib" path="lib/EasyTracker.jar"/>
<classpathentry kind="output" path="bin/classes"/> <classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>

BIN
OsmAnd/lib/EasyTracker.jar
View file

Binary file not shown.

5
OsmAnd/src/net/osmand/access/AccessibleTrackedActivity.java
View file

@ -1,17 +1,16 @@
package net.osmand.access; package net.osmand.access;
import android.app.Activity;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import com.google.android.apps.analytics.easytracking.TrackedActivity;
// Provide some additional accessibility means for activity view elements. // Provide some additional accessibility means for activity view elements.
// //
// To make use of these capabilities simply derive your activity from this class // To make use of these capabilities simply derive your activity from this class
// and then add view elements you wish to be accessible // and then add view elements you wish to be accessible
// to the accessibleContent list. // to the accessibleContent list.
// //
public class AccessibleTrackedActivity extends TrackedActivity implements AccessibleContent.Callback { public class AccessibleTrackedActivity extends Activity implements AccessibleContent.Callback {
// List of accessible views. Use accessibleContent.add(element) // List of accessible views. Use accessibleContent.add(element)
// to add element to it. // to add element to it.

5
OsmAnd/src/net/osmand/plus/activities/FavouritesListActivity.java
View file

@ -16,6 +16,7 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.search.SearchActivity; import net.osmand.plus.activities.search.SearchActivity;
import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild; import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.ListActivity;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.content.Intent; import android.content.Intent;
@ -30,12 +31,10 @@ import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.google.android.apps.analytics.easytracking.TrackedListActivity;
/** /**
* *
*/ */
public class FavouritesListActivity extends TrackedListActivity implements SearchActivityChild { public class FavouritesListActivity extends ListActivity implements SearchActivityChild {
public static final String SELECT_FAVORITE_POINT_INTENT_KEY = "SELECT_FAVORITE_POINT_INTENT_KEY"; public static final String SELECT_FAVORITE_POINT_INTENT_KEY = "SELECT_FAVORITE_POINT_INTENT_KEY";
public static final int SELECT_FAVORITE_POINT_RESULT_OK = 1; public static final int SELECT_FAVORITE_POINT_RESULT_OK = 1;

4
OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
View file

@ -37,9 +37,7 @@ import android.view.animation.Animation;
import android.view.animation.TranslateAnimation; import android.view.animation.TranslateAnimation;
import android.widget.TextView; import android.widget.TextView;
import com.google.android.apps.analytics.easytracking.TrackedActivity; public class MainMenuActivity extends Activity {
public class MainMenuActivity extends TrackedActivity {
private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$ private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$ private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$

22
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -77,9 +77,7 @@ import android.view.animation.Animation;
import android.view.animation.Transformation; import android.view.animation.Transformation;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.apps.analytics.easytracking.TrackedActivity; public class MapActivity extends Activity implements IMapLocationListener, SensorEventListener {
public class MapActivity extends TrackedActivity implements IMapLocationListener, SensorEventListener {
private static final String GPS_STATUS_ACTIVITY = "com.eclipsim.gpsstatus2.GPSStatus"; //$NON-NLS-1$ private static final String GPS_STATUS_ACTIVITY = "com.eclipsim.gpsstatus2.GPSStatus"; //$NON-NLS-1$
private static final String GPS_STATUS_COMPONENT = "com.eclipsim.gpsstatus2"; //$NON-NLS-1$ private static final String GPS_STATUS_COMPONENT = "com.eclipsim.gpsstatus2"; //$NON-NLS-1$
@ -98,8 +96,8 @@ public class MapActivity extends TrackedActivity implements IMapLocationListener
private static final int LOST_LOCATION_MSG_ID = 10; private static final int LOST_LOCATION_MSG_ID = 10;
private static final long LOST_LOCATION_CHECK_DELAY = 20000; private static final long LOST_LOCATION_CHECK_DELAY = 20000;
private static final int LONG_KEYPRESS_MSG_ID = 28; // private static final int LONG_KEYPRESS_MSG_ID = 28;
private static final int LONG_KEYPRESS_DELAY = 500; // private static final int LONG_KEYPRESS_DELAY = 500;
private long lastTimeAutoZooming = 0; private long lastTimeAutoZooming = 0;
@ -142,6 +140,7 @@ public class MapActivity extends TrackedActivity implements IMapLocationListener
notificationIndent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); notificationIndent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
Notification notification = new Notification(R.drawable.icon, "", //$NON-NLS-1$ Notification notification = new Notification(R.drawable.icon, "", //$NON-NLS-1$
System.currentTimeMillis()); System.currentTimeMillis());
notification.flags |= Notification.FLAG_AUTO_CANCEL;
notification.setLatestEventInfo(this, Version.getAppName(this), notification.setLatestEventInfo(this, Version.getAppName(this),
getString(R.string.go_back_to_osmand), PendingIntent.getActivity( getString(R.string.go_back_to_osmand), PendingIntent.getActivity(
this, 0, notificationIndent, this, 0, notificationIndent,
@ -240,6 +239,8 @@ public class MapActivity extends TrackedActivity implements IMapLocationListener
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
cancelNotification();
if (settings.MAP_SCREEN_ORIENTATION.get() != getRequestedOrientation()) { if (settings.MAP_SCREEN_ORIENTATION.get() != getRequestedOrientation()) {
setRequestedOrientation(settings.MAP_SCREEN_ORIENTATION.get()); setRequestedOrientation(settings.MAP_SCREEN_ORIENTATION.get());
// can't return from this method we are not sure if activity will be recreated or not // can't return from this method we are not sure if activity will be recreated or not
@ -589,12 +590,17 @@ public class MapActivity extends TrackedActivity implements IMapLocationListener
super.onDestroy(); super.onDestroy();
savingTrackHelper.close(); savingTrackHelper.close();
routeAnimation.close(); routeAnimation.close();
if(mNotificationManager != null){ cancelNotification();
mNotificationManager.cancel(APP_NOTIFICATION_ID);
}
getMyApplication().getResourceManager().getMapTileDownloader().removeDownloaderCallback(mapView); getMyApplication().getResourceManager().getMapTileDownloader().removeDownloaderCallback(mapView);
} }
private void cancelNotification() {
if(mNotificationManager == null){
mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
}
mNotificationManager.cancel(APP_NOTIFICATION_ID);
}
private void registerUnregisterSensor(Location location){ private void registerUnregisterSensor(Location location){

5
OsmAnd/src/net/osmand/plus/activities/NavigatePointActivity.java
View file

@ -14,6 +14,7 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.search.SearchActivity; import net.osmand.plus.activities.search.SearchActivity;
import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild; import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
import net.osmand.plus.views.OsmandMapTileView; import net.osmand.plus.views.OsmandMapTileView;
import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.location.Location; import android.location.Location;
@ -27,9 +28,7 @@ import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import com.google.android.apps.analytics.easytracking.TrackedActivity; public class NavigatePointActivity extends Activity implements SearchActivityChild {
public class NavigatePointActivity extends TrackedActivity implements SearchActivityChild {
Dialog dlg; Dialog dlg;
MapActivity activity; MapActivity activity;
int currentFormat = Location.FORMAT_DEGREES; int currentFormat = Location.FORMAT_DEGREES;

5
OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryActivity.java
View file

@ -12,6 +12,7 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild; import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
import net.osmand.plus.activities.search.SearchHistoryHelper.HistoryEntry; import net.osmand.plus.activities.search.SearchHistoryHelper.HistoryEntry;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.ListActivity;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@ -25,9 +26,7 @@ import android.widget.ImageButton;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.google.android.apps.analytics.easytracking.TrackedListActivity; public class SearchHistoryActivity extends ListActivity implements SearchActivityChild {
public class SearchHistoryActivity extends TrackedListActivity implements SearchActivityChild {
private LatLon location; private LatLon location;
private SearchHistoryHelper helper; private SearchHistoryHelper helper;
private Button clearButton; private Button clearButton;

5
OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterActivity.java
View file

@ -16,6 +16,7 @@ import net.osmand.plus.R;
import net.osmand.plus.ResourceManager; import net.osmand.plus.ResourceManager;
import net.osmand.plus.SearchByNameFilter; import net.osmand.plus.SearchByNameFilter;
import net.osmand.plus.activities.EditPOIFilterActivity; import net.osmand.plus.activities.EditPOIFilterActivity;
import android.app.ListActivity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -28,14 +29,12 @@ import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.apps.analytics.easytracking.TrackedListActivity;
/** /**
* @author Maxim Frolov * @author Maxim Frolov
* *
*/ */
public class SearchPoiFilterActivity extends TrackedListActivity { public class SearchPoiFilterActivity extends ListActivity {
public static final String SEARCH_LAT = SearchActivity.SEARCH_LAT; public static final String SEARCH_LAT = SearchActivity.SEARCH_LAT;
public static final String SEARCH_LON = SearchActivity.SEARCH_LON; public static final String SEARCH_LON = SearchActivity.SEARCH_LON;

5
OsmAnd/src/net/osmand/plus/activities/search/SearchTransportActivity.java
View file

@ -22,6 +22,7 @@ import net.osmand.plus.activities.TransportRouteHelper;
import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild; import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.app.ListActivity;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.graphics.Typeface; import android.graphics.Typeface;
@ -38,12 +39,10 @@ import android.widget.ListView;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import com.google.android.apps.analytics.easytracking.TrackedListActivity;
/** /**
* *
*/ */
public class SearchTransportActivity extends TrackedListActivity implements SearchActivityChild { public class SearchTransportActivity extends ListActivity implements SearchActivityChild {
public static final String SEARCH_LAT = SearchActivity.SEARCH_LAT; public static final String SEARCH_LAT = SearchActivity.SEARCH_LAT;
public static final String SEARCH_LON = SearchActivity.SEARCH_LON; public static final String SEARCH_LON = SearchActivity.SEARCH_LON;