Moved from onTouch to onClick listeners.

src/main/java/de/dennisguse/opentracks/ChartView.java

@@ -449,8 +449,7 @@ public class ChartView extends View {
                     synchronized (waypoints) {
                         for (int i = 0; i < waypoints.size(); i++) {
                             Waypoint waypoint = waypoints.get(i);
-                            int distance = Math.abs(
+                            int distance = Math.abs(getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
-                                    getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
                             if (distance < minDistance) {
                                 minDistance = distance;
                                 nearestWaypoint = waypoint;
@@ -482,8 +481,7 @@ public class ChartView extends View {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        updateEffectiveDimensionsIfChanged(
+        updateEffectiveDimensionsIfChanged(View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec));
-                View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(heightMeasureSpec));
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
@@ -633,8 +631,7 @@ public class ChartView extends View {
     private String getXAxisLabel() {
         Context context = getContext();
         if (chartByDistance) {
-            return metricUnits ? context.getString(R.string.unit_kilometer)
+            return metricUnits ? context.getString(R.string.unit_kilometer) : context.getString(R.string.unit_mile);
-                    : context.getString(R.string.unit_mile);
         } else {
             return context.getString(R.string.description_time);
         }
@@ -719,8 +716,7 @@ public class ChartView extends View {
         int interval = chartValueSeries.getInterval();
         float maxMarkerWidth = 0;
         for (int i = 0; i <= Y_AXIS_INTERVALS; i++) {
-            maxMarkerWidth = Math.max(maxMarkerWidth, drawYAxisMarker(chartValueSeries, canvas, xPosition,
+            maxMarkerWidth = Math.max(maxMarkerWidth, drawYAxisMarker(chartValueSeries, canvas, xPosition, i * interval + chartValueSeries.getMinMarkerValue()));
-                    i * interval + chartValueSeries.getMinMarkerValue()));
         }
         return maxMarkerWidth;
     }
@@ -734,8 +730,7 @@ public class ChartView extends View {
      * @param yValue           the y value
      * @return the marker width.
      */
-    private float drawYAxisMarker(
+    private float drawYAxisMarker(ChartValueSeries chartValueSeries, Canvas canvas, int xPosition, int yValue) {
-            ChartValueSeries chartValueSeries, Canvas canvas, int xPosition, int yValue) {
         String marker = chartValueSeries.formatMarker(yValue);
         Paint paint = chartValueSeries.getMarkerPaint();
         Rect rect = getRect(paint, marker);

src/main/java/de/dennisguse/opentracks/TrackEditActivity.java

@@ -19,7 +19,6 @@ package de.dennisguse.opentracks;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -117,16 +116,13 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
 
         activityTypeIcon = findViewById(R.id.track_edit_activity_type_icon);
         activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(this, iconValue));
-        activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
+        activityTypeIcon.setOnClickListener(new View.OnClickListener() {
             @Override
-            public boolean onTouch(View v, MotionEvent event) {
+            public void onClick(View view) {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
                 ChooseActivityTypeDialogFragment.newInstance(activityType.getText().toString()).show(
                         getSupportFragmentManager(),
                         ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG);
             }
-                return true;
-            }
         });
         activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
             @Override

src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java

@@ -22,7 +22,6 @@ import android.os.Handler;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Spinner;
@@ -99,20 +98,18 @@ public class StatsFragment extends Fragment implements TrackDataListener {
 
         Spinner activityTypeIcon = getView().findViewById(R.id.stats_activity_type_icon);
         activityTypeIcon.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getActivity(), ""));
-        activityTypeIcon.setOnTouchListener(new View.OnTouchListener() {
+        activityTypeIcon.setOnClickListener(new View.OnClickListener() {
+
             @Override
-            public boolean onTouch(View v, MotionEvent event) {
+            public void onClick(View view) {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
                 ((TrackDetailActivity) getActivity()).chooseActivityType(category);
             }
-                return true;
-            }
         });
         activityTypeIcon.setOnKeyListener(new View.OnKeyListener() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                    ((TrackDetailActivity) getActivity()).chooseActivityType(category);
+                    v.performClick();
                 }
                 return true;
             }

src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java

@@ -29,10 +29,10 @@ import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Spinner;
 
+import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.util.DialogUtils;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
-import de.dennisguse.opentracks.R;
 
 /**
  * For entering the default activity type.
@@ -64,14 +64,12 @@ public class ActivityTypePreference extends DialogPreference {
                 getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
         textView.setText(category);
 
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
-                getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
         textView.setAdapter(adapter);
         textView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-                String iconValue = TrackIconUtils.getIconValue(
+                String iconValue = TrackIconUtils.getIconValue(getContext(), (String) textView.getAdapter().getItem(position));
-                        getContext(), (String) textView.getAdapter().getItem(position));
                 TrackIconUtils.setIconSpinner(spinner, iconValue);
             }
         });