merge heads

MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java

@@ -223,7 +223,7 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     editor.putLong(getActivity().getString(R.string.recording_track_key), -1);
 
     editor.clear();
-    editor.commit();
+    editor.apply();
   }
 
   /**

MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java

@@ -138,7 +138,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
     Track track = new Track();
     prefs.edit().putLong("recordingTrack", TRACK_ID)
-                .putLong("selectedTrack", TRACK_ID).commit();
+                .putLong("selectedTrack", TRACK_ID).apply();
     expect(providerUtils.getTrack(TRACK_ID)).andStubReturn(track);
     expectStart();
     dataSources.registerContentObserver(
@@ -297,7 +297,7 @@ public class TrackDataHubTest extends AndroidTestCase {
   public void testWaypointListen() {
     Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
     prefs.edit().putLong("recordingTrack", TRACK_ID)
-                .putLong("selectedTrack", TRACK_ID).commit();
+                .putLong("selectedTrack", TRACK_ID).apply();
 
     Waypoint wpt1 = new Waypoint(),
              wpt2 = new Waypoint(),
@@ -411,7 +411,7 @@ public class TrackDataHubTest extends AndroidTestCase {
   public void testPointsListen() {
     Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
     prefs.edit().putLong("recordingTrack", TRACK_ID)
-                .putLong("selectedTrack", TRACK_ID).commit();
+                .putLong("selectedTrack", TRACK_ID).apply();
 
     expectStart();
     dataSources.registerContentObserver(
@@ -498,7 +498,7 @@ public class TrackDataHubTest extends AndroidTestCase {
   public void testPointsListen_reRegister() {
     Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
     prefs.edit().putLong("recordingTrack", TRACK_ID)
-                .putLong("selectedTrack", TRACK_ID).commit();
+                .putLong("selectedTrack", TRACK_ID).apply();
 
     expectStart();
     dataSources.registerContentObserver(
@@ -570,7 +570,7 @@ public class TrackDataHubTest extends AndroidTestCase {
   public void testPointsListen_reRegisterTrackChanged() {
     Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
     prefs.edit().putLong("recordingTrack", TRACK_ID)
-                .putLong("selectedTrack", TRACK_ID).commit();
+                .putLong("selectedTrack", TRACK_ID).apply();
 
     expectStart();
     dataSources.registerContentObserver(
@@ -628,7 +628,7 @@ public class TrackDataHubTest extends AndroidTestCase {
   public void testPointsListen_largeTrackSampling() {
     Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
     prefs.edit().putLong("recordingTrack", TRACK_ID)
-                .putLong("selectedTrack", TRACK_ID).commit();
+                .putLong("selectedTrack", TRACK_ID).apply();
 
     expectStart();
     dataSources.registerContentObserver(
@@ -661,7 +661,7 @@ public class TrackDataHubTest extends AndroidTestCase {
   public void testPointsListen_resampling() {
     Capture<ContentObserver> observerCapture = new Capture<ContentObserver>();
     prefs.edit().putLong("recordingTrack", TRACK_ID)
-                .putLong("selectedTrack", TRACK_ID).commit();
+                .putLong("selectedTrack", TRACK_ID).apply();
 
     expectStart();
     dataSources.registerContentObserver(
@@ -814,7 +814,7 @@ public class TrackDataHubTest extends AndroidTestCase {
     prefs.edit()
         .putBoolean(metricUnitsKey, true)
         .putBoolean(speedKey, true)
-        .commit();
+        .apply();
 
     Capture<OnSharedPreferenceChangeListener> listenerCapture =
         new Capture<OnSharedPreferenceChangeListener>();
@@ -840,7 +840,7 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     prefs.edit()
         .putBoolean(speedKey, false)
-        .commit();
+        .apply();
     OnSharedPreferenceChangeListener listener = listenerCapture.getValue();
     listener.onSharedPreferenceChanged(prefs, speedKey);
 
@@ -854,7 +854,7 @@ public class TrackDataHubTest extends AndroidTestCase {
 
     prefs.edit()
         .putBoolean(metricUnitsKey, false)
-        .commit();
+        .apply();
     listener.onSharedPreferenceChanged(prefs, metricUnitsKey);
 
     verifyAndReset();

MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java

@@ -48,13 +48,13 @@ public class PreferenceBackupHelperTest extends TestCase {
 
     @Override
     public boolean commit() {
-      preferenceValues = newPreferences;
+      apply();
       return true;
     }
 
     @Override
     public void apply() {
-      commit();
+      preferenceValues = newPreferences;
     }
 
     @Override
@@ -185,7 +185,7 @@ public class PreferenceBackupHelperTest extends TestCase {
     editor.putInt("int1", 42);
     editor.putLong("long1", 123456789L);
     editor.putString("str1", "lolcat");
-    editor.commit();
+    editor.apply();
 
     // Export it
     byte[] exported = preferenceBackupHelper.exportPreferences(preferences);
@@ -195,7 +195,7 @@ public class PreferenceBackupHelperTest extends TestCase {
     editor.clear();
     editor.putString("str2", "Shouldn't be there after restore");
     editor.putBoolean("bool2", true);
-    editor.commit();
+    editor.apply();
 
     // Import it back
     preferenceBackupHelper.importPreferences(exported, preferences);

MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java

@@ -57,7 +57,7 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase {
   private <T> void testTrackPathPainterFactorySpecific(Context context, SharedPreferences prefs, 
       int track_color_mode, Class <?> c) {
     prefs.edit().putString(context.getString(R.string.track_color_mode_key), 
-        context.getString(track_color_mode)).commit();
+        context.getString(track_color_mode)).apply();
     
     int startLocationIdx = 0;
     Boolean alwaysVisible = true;

MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java

@@ -154,14 +154,14 @@ public class TrackRecordingServiceTest
     sharedPreferences = context.getSharedPreferences(
         Constants.SETTINGS_NAME, 0);
     // Let's use default values.
-    sharedPreferences.edit().clear().commit();
+    sharedPreferences.edit().clear().apply();
 
     // Disable auto resume by default.
     updateAutoResumePrefs(0, -1);
     // No recording track.
     Editor editor = sharedPreferences.edit();
     editor.putLong(context.getString(R.string.recording_track_key), -1);
-    editor.commit();
+    editor.apply();
   }
 
   @SmallTest
@@ -654,7 +654,7 @@ public class TrackRecordingServiceTest
     R.string.auto_resume_track_current_retry_key), attempts);
     editor.putInt(context.getString(
         R.string.auto_resume_track_timeout_key), timeoutMins);
-    editor.commit();
+    editor.apply();
   }
 
   private Intent createStartIntent() {
@@ -673,7 +673,7 @@ public class TrackRecordingServiceTest
   private void setRecordingTrack(long id) {
     Editor editor = sharedPreferences.edit();
     editor.putLong(context.getString(R.string.recording_track_key), id);
-    editor.commit();
+    editor.apply();
   }
 
   // TODO: We support multiple values for readability, however this test's
@@ -697,7 +697,7 @@ public class TrackRecordingServiceTest
       } else if (value == null) {
         // Do nothing, as clear above has already removed this property.
       }
-      editor.commit();
+      editor.apply();
 
       fullRecordingSession();
     }

MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java

@@ -20,7 +20,7 @@ public class SensorManagerFactoryTest extends AndroidTestCase {
     sharedPreferences = getContext().getSharedPreferences(
         Constants.SETTINGS_NAME, 0);
     // Let's use default values.
-    sharedPreferences.edit().clear().commit();
+    sharedPreferences.edit().clear().apply();
   }
   
   @SmallTest
@@ -47,7 +47,7 @@ public class SensorManagerFactoryTest extends AndroidTestCase {
     sharedPreferences.edit()
         .putString(getContext().getString(R.string.sensor_type_key),
             getContext().getString(i))
-        .commit();
+        .apply();
     SensorManager sm = SensorManagerFactory.getSensorManager(getContext());
     assertNotNull(sm);
     assertTrue(c.isInstance(sm));

MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java

@@ -18,7 +18,6 @@ package com.google.android.apps.mytracks.services.sensors.ant;
 import com.dsi.ant.AntMesg;
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager;
 import com.google.android.maps.mytracks.R;
 
 import android.content.SharedPreferences;
@@ -34,7 +33,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase {
     sharedPreferences = getContext().getSharedPreferences(
         Constants.SETTINGS_NAME, 0);
     // Let's use default values.
-    sharedPreferences.edit().clear().commit();
+    sharedPreferences.edit().clear().apply();
     manager = new AntDirectSensorManager(getContext());
   }