diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml index 38ca8638f..d50ec9442 100644 --- a/MyTracks/res/layout/about.xml +++ b/MyTracks/res/layout/about.xml @@ -48,7 +48,7 @@ limitations under the License. + style="@style/AboutTextView.Column0"/> + style="@style/AboutTextView.Column0"/> @@ -85,7 +85,7 @@ limitations under the License. + style="@style/AboutTextView.Column0"/> @@ -93,7 +93,7 @@ limitations under the License. + style="@style/AboutTextView.Column0"/> diff --git a/MyTracks/res/layout/track_widget.xml b/MyTracks/res/layout/track_widget.xml index 8a0e17e75..f76763000 100644 --- a/MyTracks/res/layout/track_widget.xml +++ b/MyTracks/res/layout/track_widget.xml @@ -48,10 +48,10 @@ limitations under the License. android:layout_width="fill_parent" android:orientation="horizontal"> diff --git a/MyTracks/res/layout/welcome.xml b/MyTracks/res/layout/welcome.xml index 815e9bcc9..ac0c05a95 100644 --- a/MyTracks/res/layout/welcome.xml +++ b/MyTracks/res/layout/welcome.xml @@ -35,106 +35,106 @@ limitations under the License. android:src="@drawable/arrow_icon"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> + style="@style/WelcomeTextView.Question"/> + style="@style/WelcomeTextView"/> diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml index 5094df6b1..94440dc6d 100644 --- a/MyTracks/res/values/styles.xml +++ b/MyTracks/res/values/styles.xml @@ -28,8 +28,8 @@ limitations under the License. 20sp - - - - + + + - - - - + + + + - - - - - - + + + - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java index 615161fdd..45a872cb9 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java @@ -31,6 +31,7 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; @@ -682,7 +683,9 @@ public class SettingsActivity extends PreferenceActivity { metricspeed = newValue; } SharedPreferences prefs = getPreferenceManager().getSharedPreferences(); - prefs.edit().putString(getString(id), metricspeed).commit(); + Editor editor = prefs.edit(); + editor.putString(getString(id), metricspeed); + ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java index f20e693e6..4a3cc2738 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelper.java @@ -16,6 +16,7 @@ package com.google.android.apps.mytracks.io.backup; import com.google.android.apps.mytracks.content.ContentTypeIds; +import com.google.android.apps.mytracks.util.ApiFeatures; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; @@ -77,15 +78,14 @@ class PreferenceBackupHelper { * * @param data the byte array to read preferences from * @param preferences the shared preferences to edit - * @return whether the preference change was successful * @throws IOException if there are any errors while reading */ - public boolean importPreferences(byte[] data, SharedPreferences preferences) + public void importPreferences(byte[] data, SharedPreferences preferences) throws IOException { ByteArrayInputStream bufStream = new ByteArrayInputStream(data); DataInputStream reader = new DataInputStream(bufStream); - return importPreferences(reader, preferences); + importPreferences(reader, preferences); } /** @@ -93,10 +93,9 @@ class PreferenceBackupHelper { * * @param reader the stream to read from * @param preferences the shared preferences to edit - * @return whether the preference change was successful * @throws IOException if there are any errors while reading */ - public boolean importPreferences(DataInputStream reader, + public void importPreferences(DataInputStream reader, SharedPreferences preferences) throws IOException { Editor editor = preferences.edit(); editor.clear(); @@ -107,8 +106,7 @@ class PreferenceBackupHelper { byte typeId = reader.readByte(); readAndSetPreference(name, typeId, reader, editor); } - - return editor.commit(); + ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java index 6cc1e28d2..501fadf39 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java @@ -16,10 +16,12 @@ package com.google.android.apps.mytracks.services; import com.google.android.apps.mytracks.Constants; +import com.google.android.apps.mytracks.util.ApiFeatures; import com.google.android.maps.mytracks.R; import android.content.Context; import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.util.Log; @@ -170,24 +172,21 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener { } public void setAutoResumeTrackCurrentRetry(int retryAttempts) { - sharedPreferences - .edit() - .putInt(autoResumeTrackCurrentRetryKey, retryAttempts) - .commit(); + Editor editor = sharedPreferences.edit(); + editor.putInt(autoResumeTrackCurrentRetryKey, retryAttempts); + ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor); } public void setRecordingTrack(long id) { - sharedPreferences - .edit() - .putLong(recordingTrackKey, id) - .commit(); + Editor editor = sharedPreferences.edit(); + editor.putLong(recordingTrackKey, id); + ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor); } public void setSelectedTrack(long id) { - sharedPreferences - .edit() - .putLong(selectedTrackKey, id) - .commit(); + Editor editor = sharedPreferences.edit(); + editor.putLong(selectedTrackKey, id); + ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor); } public void shutdown() { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java index e833eae1a..4c0db0864 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManager.java @@ -22,6 +22,7 @@ import com.dsi.ant.AntMesg; import com.dsi.ant.exception.AntInterfaceException; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.content.Sensor; +import com.google.android.apps.mytracks.util.ApiFeatures; import com.google.android.maps.mytracks.R; import android.content.Context; @@ -134,7 +135,7 @@ public class AntDirectSensorManager extends AntSensorManager { Constants.SETTINGS_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = prefs.edit(); editor.putInt(context.getString(R.string.ant_heart_rate_sensor_id_key), deviceNumberHRM); - editor.commit(); + ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor); } private void handleMessageResponse(byte[] rawMessage) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java deleted file mode 100644 index 60a83661b..000000000 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSRMSensorManager.java +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright 2009 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.android.apps.mytracks.services.sensors.ant; - -import static com.google.android.apps.mytracks.Constants.TAG; - -import com.dsi.ant.AntDefine; -import com.dsi.ant.AntMesg; -import com.dsi.ant.exception.AntInterfaceException; -import com.google.android.apps.mytracks.Constants; -import com.google.android.apps.mytracks.content.Sensor; -import com.google.android.apps.mytracks.services.sensors.SensorUtils; -import com.google.android.maps.mytracks.R; - -import android.content.Context; -import android.content.SharedPreferences; -import android.util.Log; - -/** - * A sensor manager that can connect to an SRM Power Control 7 head unit. - * - * @author Sandor Dornbush - */ -public class AntSRMSensorManager extends AntSensorManager { - - /* - * These constants are defined by the SRM Headunit spec. - */ - public static final byte NETWORK_NUMBER = (byte) 0; - public static final byte DEVICE_TYPE = (byte) 12; - public static final byte MANUFACTURER_ID = (byte) 1; - public static final short CHANNEL_PERIOD = (short) 8192; - public static final byte RF_FREQUENCY = (byte) 50; - - public static final int MESSAGE_TYPE_INDEX = 3; - public static final int INITIALS_MESSAGE_TYPE = 5; - public static final int SENSOR_DATA_MESSAGE_TYPE = 6; - - public static final int MESSAGE_ID_INDEX = 4; - - /** - * This can be any value between 0..8 - */ - private byte channel = (byte) 5; - - /** - * This is the id of this device. - * The head unit must be programmed to expect this number. - */ - private byte deviceId; - - /** - * The id of the last message received from the SRM head unit. - */ - private int lastMessageId; - - public AntSRMSensorManager(Context context) { - super(context); - - // First read the the device id that we will be announcing. - SharedPreferences prefs = context.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - if (prefs != null) { - deviceId = (byte) prefs.getInt( - context.getString(R.string.ant_srm_bridge_sensor_id_key), - WILDCARD); - } - } - - @Override - public void handleMessage(byte[] antMessage) { - // Parse channel number - byte recievedChannel = (byte) (antMessage[AntMesg.MESG_DATA_OFFSET] - & AntDefine.CHANNEL_NUMBER_MASK); - if (recievedChannel != channel) { - Log.d(TAG, "Unexpected channel: " + recievedChannel); - return; - } - switch (antMessage[AntMesg.MESG_ID_OFFSET]) { - case AntMesg.MESG_BROADCAST_DATA_ID: - handleBroadcastData(antMessage); - break; - case AntMesg.MESG_RESPONSE_EVENT_ID: - handleMessageResponse(antMessage); - break; - case AntMesg.MESG_CHANNEL_ID_ID: - handleChannelId(antMessage); - break; - default: - Log.e(TAG, "Unexpected message id: " + antMessage[3]); - } - } - - private void handleBroadcastData(byte[] antMessage) { - if (deviceId == WILDCARD) { - try { - Log.d(TAG, "Requesting channel id id."); - getAntReceiver().ANTRequestMessage(channel, AntMesg.MESG_CHANNEL_ID_ID); - } catch (AntInterfaceException e) { - Log.e(TAG, "Failed to request channel id id", e); - } - } - setSensorState(Sensor.SensorState.CONNECTED); - switch(antMessage[MESSAGE_TYPE_INDEX]) { - case INITIALS_MESSAGE_TYPE: - // TODO handle initials message. - break; - case SENSOR_DATA_MESSAGE_TYPE: - parseSensorData(antMessage); - break; - default: - Log.e(TAG, "Unexpected message type: " + antMessage[MESSAGE_TYPE_INDEX]); - } - } - - private void handleChannelId(byte[] antMessage) { - // Store the device id. - deviceId = antMessage[3]; - Log.i(TAG, "Found device id: " + deviceId); - - SharedPreferences prefs = context.getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - SharedPreferences.Editor editor = prefs.edit(); - editor.putInt(context.getString(R.string.ant_srm_bridge_sensor_id_key), deviceId); - editor.commit(); - } - - private void handleMessageResponse(byte[] antMessage) { - if (antMessage[3] == AntMesg.MESG_EVENT_ID - && antMessage[4] == AntDefine.EVENT_RX_SEARCH_TIMEOUT) { - // Search timeout - Log.w(TAG, "Search timed out. Unassigning channel."); - try { - getAntReceiver().ANTUnassignChannel(channel); - } catch (AntInterfaceException e) { - Log.e(TAG, "Failed to unassign ANT channel", e); - } - setSensorState(Sensor.SensorState.DISCONNECTED); - } else if (antMessage[3] == AntMesg.MESG_UNASSIGN_CHANNEL_ID) { - setSensorState(Sensor.SensorState.DISCONNECTED); - Log.i(TAG, "Disconnected from the sensor: " + getSensorState()); - } - } - - private void parseSensorData(byte[] antMessage) { - if (antMessage.length != 11) { - Log.e(TAG, "Unexpected ant message length: " + antMessage.length); - return; - } - - int newMessageId = antMessage[MESSAGE_ID_INDEX] & 0xFF; - if (lastMessageId == newMessageId) { - // Repeated message. - Log.i(TAG, String.format("SRM ignoring repeat: 0x%X", newMessageId)); - return; - } - if (newMessageId < lastMessageId) { - if (!(newMessageId < 20 && lastMessageId > 200)) { - Log.i(TAG, String.format("SRM ignoring repeat: 0x%X", newMessageId)); - return; - } // else assume the byte overflowed to 0. - } - lastMessageId = newMessageId; - - Sensor.SensorDataSet.Builder builder = Sensor.SensorDataSet.newBuilder() - .setCreationTime(System.currentTimeMillis()); - - int power = SensorUtils.unsignedShortToInt(antMessage, 5); - if (power >= 0) { - Sensor.SensorData.Builder b = Sensor.SensorData.newBuilder() - .setValue(power) - .setState(Sensor.SensorState.SENDING); - builder.setPower(b); - } - - int speed = SensorUtils.unsignedShortToInt(antMessage, 7); - if (speed >= 0) { - // The speed from srm is in 1/10 km/hr. - // Sensor data expects the speed as m/s. - // TODO finish this. - //sensorData.setWheelSpeed(UnitConversions.TENTH_KMH_TO_MPS * speed); - } - - int cadence = antMessage[9] & 0xFF; - if (cadence >= 0) { - Sensor.SensorData.Builder b = Sensor.SensorData.newBuilder() - .setValue(cadence) - .setState(Sensor.SensorState.SENDING); - builder.setCadence(b); - } - - int bpm = antMessage[10] & 0xFF; - if (bpm > 0) { - Sensor.SensorData.Builder b = Sensor.SensorData.newBuilder() - .setValue(bpm) - .setState(Sensor.SensorState.SENDING); - builder.setHeartRate(b); - } - sensorData = builder.build(); - } - - @Override - protected void setupAntSensorChannels() { - lastMessageId = 0; - setupAntSensorChannel(NETWORK_NUMBER, - channel, - deviceId, - DEVICE_TYPE, - MANUFACTURER_ID, - CHANNEL_PERIOD, - RF_FREQUENCY, - (byte) 0); - } -} diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java index 9de37ecad..1db754b4d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java @@ -22,6 +22,7 @@ import com.dsi.ant.AntMesg; import com.dsi.ant.exception.AntInterfaceException; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.content.Sensor; +import com.google.android.apps.mytracks.util.ApiFeatures; import com.google.android.apps.mytracks.util.SystemUtils; import com.google.android.maps.mytracks.R; @@ -151,6 +152,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { int powerVal = (((msg[INDEX_MESSAGE_POWER] & 0xFF) << 8) | (msg[INDEX_MESSAGE_POWER+1] & 0xFF)); + @SuppressWarnings("unused") int speedVal = (((msg[INDEX_MESSAGE_SPEED] & 0xFF) << 8) | (msg[INDEX_MESSAGE_SPEED+1] & 0xFF)); int cadenceVal = (msg[INDEX_MESSAGE_CADENCE] & 0xFF); @@ -162,12 +164,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { .setValue(powerVal) .setState(Sensor.SensorState.SENDING); - // Although speed is available from the SRM Bridge, MyTracks doesn't - // use the value, and computes speed from the GPS location data. -// Sensor.SensorData.Builder speed = -// Sensor.SensorData.newBuilder() -// .setValue(speedVal) -// .setState(Sensor.SensorState.SENDING); + /* + * Although speed is available from the SRM Bridge, MyTracks doesn't use the value, and + * computes speed from the GPS location data. + */ +// Sensor.SensorData.Builder speed = Sensor.SensorData.newBuilder().setValue(speedVal).setState( +// Sensor.SensorState.SENDING); Sensor.SensorData.Builder cadence = Sensor.SensorData.newBuilder() @@ -197,7 +199,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { Constants.SETTINGS_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = prefs.edit(); editor.putInt(context.getString(R.string.ant_srm_bridge_sensor_id_key), deviceNumber); - editor.commit(); + ApiFeatures.getInstance().getApiAdapter().applyPreferenceChanges(editor); } private void handleMessageResponse(byte[] rawMessage) { diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java index 00216d687..ef3e0b9f4 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/MyTracksTest.java @@ -224,7 +224,7 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2{ editor.putLong(getActivity().getString(R.string.recording_track_key), -1); editor.clear(); - editor.commit(); + editor.apply(); } /** diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java index 45f78d7d7..eae73f0e5 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java @@ -139,7 +139,7 @@ public class TrackDataHubTest extends AndroidTestCase { Capture observerCapture = new Capture(); 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( @@ -298,7 +298,7 @@ public class TrackDataHubTest extends AndroidTestCase { public void testWaypointListen() { Capture observerCapture = new Capture(); prefs.edit().putLong("recordingTrack", TRACK_ID) - .putLong("selectedTrack", TRACK_ID).commit(); + .putLong("selectedTrack", TRACK_ID).apply(); Waypoint wpt1 = new Waypoint(), wpt2 = new Waypoint(), @@ -412,7 +412,7 @@ public class TrackDataHubTest extends AndroidTestCase { public void testPointsListen() { Capture observerCapture = new Capture(); prefs.edit().putLong("recordingTrack", TRACK_ID) - .putLong("selectedTrack", TRACK_ID).commit(); + .putLong("selectedTrack", TRACK_ID).apply(); expectStart(); dataSources.registerContentObserver( @@ -499,7 +499,7 @@ public class TrackDataHubTest extends AndroidTestCase { public void testPointsListen_reRegister() { Capture observerCapture = new Capture(); prefs.edit().putLong("recordingTrack", TRACK_ID) - .putLong("selectedTrack", TRACK_ID).commit(); + .putLong("selectedTrack", TRACK_ID).apply(); expectStart(); dataSources.registerContentObserver( @@ -571,7 +571,7 @@ public class TrackDataHubTest extends AndroidTestCase { public void testPointsListen_reRegisterTrackChanged() { Capture observerCapture = new Capture(); prefs.edit().putLong("recordingTrack", TRACK_ID) - .putLong("selectedTrack", TRACK_ID).commit(); + .putLong("selectedTrack", TRACK_ID).apply(); expectStart(); dataSources.registerContentObserver( @@ -629,7 +629,7 @@ public class TrackDataHubTest extends AndroidTestCase { public void testPointsListen_largeTrackSampling() { Capture observerCapture = new Capture(); prefs.edit().putLong("recordingTrack", TRACK_ID) - .putLong("selectedTrack", TRACK_ID).commit(); + .putLong("selectedTrack", TRACK_ID).apply(); expectStart(); dataSources.registerContentObserver( @@ -662,7 +662,7 @@ public class TrackDataHubTest extends AndroidTestCase { public void testPointsListen_resampling() { Capture observerCapture = new Capture(); prefs.edit().putLong("recordingTrack", TRACK_ID) - .putLong("selectedTrack", TRACK_ID).commit(); + .putLong("selectedTrack", TRACK_ID).apply(); expectStart(); dataSources.registerContentObserver( @@ -815,7 +815,7 @@ public class TrackDataHubTest extends AndroidTestCase { prefs.edit() .putBoolean(metricUnitsKey, true) .putBoolean(speedKey, true) - .commit(); + .apply(); Capture listenerCapture = new Capture(); @@ -841,7 +841,7 @@ public class TrackDataHubTest extends AndroidTestCase { prefs.edit() .putBoolean(speedKey, false) - .commit(); + .apply(); OnSharedPreferenceChangeListener listener = listenerCapture.getValue(); listener.onSharedPreferenceChanged(prefs, speedKey); @@ -855,7 +855,7 @@ public class TrackDataHubTest extends AndroidTestCase { prefs.edit() .putBoolean(metricUnitsKey, false) - .commit(); + .apply(); listener.onSharedPreferenceChanged(prefs, metricUnitsKey); verifyAndReset(); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java index 25a6c2504..4a3af7f5a 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java +++ b/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); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java index 8cc843890..8673cbe1d 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java @@ -58,7 +58,7 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase { private 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; diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java index f1e64a6f6..25fe512ef 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java @@ -153,14 +153,14 @@ public class TrackRecordingServiceTest sharedPreferences = context.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); // 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 @@ -653,7 +653,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() { @@ -672,7 +672,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 @@ -696,7 +696,7 @@ public class TrackRecordingServiceTest } else if (value == null) { // Do nothing, as clear above has already removed this property. } - editor.commit(); + editor.apply(); fullRecordingSession(); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java index cf6efc36c..172f6acdf 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java @@ -2,7 +2,7 @@ package com.google.android.apps.mytracks.services.sensors; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager; -import com.google.android.apps.mytracks.services.sensors.ant.AntSRMSensorManager; +import com.google.android.apps.mytracks.services.sensors.ant.AntSrmBridgeSensorManager; import com.google.android.maps.mytracks.R; import android.content.Context; @@ -21,7 +21,7 @@ public class SensorManagerFactoryTest extends AndroidTestCase { sharedPreferences = getContext().getSharedPreferences( Constants.SETTINGS_NAME, Context.MODE_PRIVATE); // Let's use default values. - sharedPreferences.edit().clear().commit(); + sharedPreferences.edit().clear().apply(); } @SmallTest @@ -41,14 +41,14 @@ public class SensorManagerFactoryTest extends AndroidTestCase { @SmallTest public void testCreateAntSRM() throws Exception { - assertClassForName(AntSRMSensorManager.class, R.string.sensor_type_value_srm_ant_bridge); + assertClassForName(AntSrmBridgeSensorManager.class, R.string.sensor_type_value_srm_ant_bridge); } private void assertClassForName(Class c, int i) { 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)); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java index 87aae7c8f..dfaf9598e 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java @@ -34,7 +34,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase { sharedPreferences = getContext().getSharedPreferences( Constants.SETTINGS_NAME, Context.MODE_PRIVATE); // Let's use default values. - sharedPreferences.edit().clear().commit(); + sharedPreferences.edit().clear().apply(); manager = new AntDirectSensorManager(getContext()); }