Cosmetic and unused method changes.

MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java

@@ -93,13 +93,13 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener {
       return;
     }
     if (key == null || key.equals(minRecordingDistanceKey)) {
-      service.setMinRecordingDistance(
+      int minRecordingDistance = sharedPreferences.getInt(
-          sharedPreferences.getInt(
+          minRecordingDistanceKey,
-              minRecordingDistanceKey,
+          Constants.DEFAULT_MIN_RECORDING_DISTANCE);
-              Constants.DEFAULT_MIN_RECORDING_DISTANCE));
+      service.setMinRecordingDistance(minRecordingDistance);
       Log.d(Constants.TAG,
           "TrackRecordingService: minRecordingDistance = "
-          + service.getMinRecordingDistance());
+          + minRecordingDistance);
     }
     if (key == null || key.equals(maxRecordingDistanceKey)) {
       service.setMaxRecordingDistance(sharedPreferences.getInt(

MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java

@@ -56,6 +56,7 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.net.Uri;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -356,7 +357,7 @@ public class TrackRecordingService extends Service implements LocationListener {
   /**
    * Shows the notification message and icon in the notification bar.
    */
-  public void showNotification() {
+  private void showNotification() {
     final ApiPlatformAdapter apiPlatformAdapter =
         ApiFeatures.getInstance().getApiPlatformAdapter();
     if (isRecording) {
@@ -376,7 +377,7 @@ public class TrackRecordingService extends Service implements LocationListener {
     }
   }
 
-  public void registerLocationListener() {
+  private void registerLocationListener() {
     if (locationManager == null) {
       Log.e(TAG,
           "TrackRecordingService: Do not have any location manager.");
@@ -401,7 +402,7 @@ public class TrackRecordingService extends Service implements LocationListener {
     }
   }
 
-  public void unregisterLocationListener() {
+  private void unregisterLocationListener() {
     if (locationManager == null) {
       Log.e(TAG,
           "TrackRecordingService: Do not have any location manager.");
@@ -481,6 +482,7 @@ public class TrackRecordingService extends Service implements LocationListener {
 
   /*
    * Location listener implementation: =================================
+   * TODO: Move to inner class.
    */
   @Override
   public void onLocationChanged(final Location location) {
@@ -759,13 +761,6 @@ public class TrackRecordingService extends Service implements LocationListener {
     return super.onUnbind(intent);
   }
 
-  @Override
-  public boolean stopService(Intent name) {
-    Log.d(TAG, "TrackRecordingService.stopService");
-    unregisterLocationListener();
-    return super.stopService(name);
-  }
-  
   @Override
   public void onStart(Intent intent, int startId) {
     handleStartCommand(intent, startId);
@@ -1169,23 +1164,15 @@ public class TrackRecordingService extends Service implements LocationListener {
     return recordingTrackId;
   }
 
-  public void setRecordingTrackId(long recordingTrackId) {
+  void setRecordingTrackId(long recordingTrackId) {
     this.recordingTrackId = recordingTrackId;
   }
 
-  public int getMaxRecordingDistance() {
+  void setMaxRecordingDistance(int maxRecordingDistance) {
-    return maxRecordingDistance;
-  }
-
-  public void setMaxRecordingDistance(int maxRecordingDistance) {
     this.maxRecordingDistance = maxRecordingDistance;
   }
 
-  public int getMinRecordingDistance() {
+  void setMinRecordingDistance(int minRecordingDistance) {
-    return minRecordingDistance;
-  }
-
-  public void setMinRecordingDistance(int minRecordingDistance) {
     this.minRecordingDistance = minRecordingDistance;
     if (statsBuilder != null && waypointStatsBuilder != null) {
       statsBuilder.setMinRecordingDistance(minRecordingDistance);
@@ -1193,40 +1180,27 @@ public class TrackRecordingService extends Service implements LocationListener {
     }
   }
 
-  public int getMinRequiredAccuracy() {
+  void setMinRequiredAccuracy(int minRequiredAccuracy) {
-    return minRequiredAccuracy;
-  }
-
-  public void setMinRequiredAccuracy(int minRequiredAccuracy) {
     this.minRequiredAccuracy = minRequiredAccuracy;
   }
 
-  public LocationListenerPolicy getLocationListenerPolicy() {
+  void setLocationListenerPolicy(LocationListenerPolicy locationListenerPolicy) {
-    return locationListenerPolicy;
-  }
-
-  public void setLocationListenerPolicy(
-      LocationListenerPolicy locationListenerPolicy) {
     this.locationListenerPolicy = locationListenerPolicy;
   }
 
-  public int getAutoResumeTrackTimeout() {
+  void setAutoResumeTrackTimeout(int autoResumeTrackTimeout) {
-    return autoResumeTrackTimeout;
-  }
-  
-  public void setAutoResumeTrackTimeout(int autoResumeTrackTimeout) {
     this.autoResumeTrackTimeout = autoResumeTrackTimeout;
   }
 
-  public void setAnnouncementFrequency(int announcementFrequency) {
+  void setAnnouncementFrequency(int announcementFrequency) {
     announcementExecutor.setTaskFrequency(announcementFrequency);
   }
 
-  public void setSplitFrequency(int frequency) {
+  void setSplitFrequency(int frequency) {
     splitExecutor.setTaskFrequency(frequency);
   }
 
-  public void setMetricUnits(boolean metric) {
+  void setMetricUnits(boolean metric) {
     announcementExecutor.setMetricUnits(metric);
     splitExecutor.setMetricUnits(metric);
   }