diff --git a/MyTracks/res/layout/track_widget_4x3.xml b/MyTracks/res/layout/track_widget_4x3.xml
index 848f47396..61e650047 100644
--- a/MyTracks/res/layout/track_widget_4x3.xml
+++ b/MyTracks/res/layout/track_widget_4x3.xml
@@ -43,7 +43,9 @@ limitations under the License.
           </LinearLayout>
         </LinearLayout>
         <!-- vertical separator -->
-        <LinearLayout style="@style/TrackWidgetVerticalSeparator" >
+        <LinearLayout
+          android:baselineAligned="false"
+          style="@style/TrackWidgetVerticalSeparator" >
           <LinearLayout
             android:layout_weight="2"
             style="@style/TrackWidgetVerticalSpacer" />
@@ -102,7 +104,9 @@ limitations under the License.
           </LinearLayout>
         </LinearLayout>
         <!-- vertical separator -->
-        <LinearLayout style="@style/TrackWidgetVerticalSeparator" >
+        <LinearLayout
+          android:baselineAligned="false"
+          style="@style/TrackWidgetVerticalSeparator" >
           <LinearLayout
             android:layout_weight="1"
             style="@style/TrackWidgetVerticalLine" />
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java
index c8ea7bc86..eb4593bd5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java
@@ -17,7 +17,6 @@ package com.google.android.apps.mytracks.io.backup;
 
 import com.google.android.apps.mytracks.Constants;
 
-import android.annotation.TargetApi;
 import android.app.backup.BackupAgent;
 import android.app.backup.BackupDataInput;
 import android.app.backup.BackupDataOutput;
@@ -35,7 +34,6 @@ import java.io.IOException;
  * 
  * @author Rodrigo Damazio
  */
-@TargetApi(8)
 public class MyTracksBackupAgent extends BackupAgent {
   private static final String PREFERENCES_ENTITY = "prefs";
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
index 67b3e8071..8926f4e0b 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -18,7 +18,6 @@ package com.google.android.apps.mytracks.endtoendtest;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
@@ -37,7 +36,6 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
-  @TargetApi(8)
   public CreateAndSendTrackTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
index 3df458d9d..9c111c7d6 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
@@ -18,7 +18,6 @@ package com.google.android.apps.mytracks.endtoendtest;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.widget.ListView;
@@ -35,7 +34,6 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
-  @TargetApi(16)
   public DeleteTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
index 92ed81064..fea09c2ec 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
@@ -19,7 +19,6 @@ import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ -35,7 +34,6 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
-  @TargetApi(8)
   public ExportAndImportTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
index eb0ac9188..70747c8f9 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
@@ -18,7 +18,6 @@ package com.google.android.apps.mytracks.endtoendtest;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
@@ -38,7 +37,6 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
   private TrackListActivity activityMyTracks;
   private final static String SHARE_ITEM_PARENT_VIEW_NAME = "RecycleListView";
 
-  @TargetApi(8)
   public MenuItemsTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
index d08074095..ff422c55f 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
@@ -20,7 +20,6 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator;
 import com.google.android.apps.mytracks.services.TrackRecordingService;
 
-import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.location.Location;
 import android.test.ActivityInstrumentationTestCase2;
@@ -36,7 +35,6 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
-  @TargetApi(15)
   public PauseRecordingTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java
index c65ee6a61..8fd79c71d 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java
@@ -17,7 +17,6 @@ package com.google.android.apps.mytracks.endtoendtest;
 
 import com.google.android.apps.mytracks.TrackListActivity;
 
-import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ -31,7 +30,6 @@ public class SaveToSdCardTest extends ActivityInstrumentationTestCase2<TrackList
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
-  @TargetApi(8)
   public SaveToSdCardTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
index 5428c5676..30a2be078 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -19,7 +19,6 @@ import com.google.android.apps.mytracks.ChartView;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.widget.CheckBox;
@@ -36,7 +35,6 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
-  @TargetApi(8)
   public SettingTest() {
     super(TrackListActivity.class);
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
index a51ec17db..6cdf63e04 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
@@ -20,7 +20,6 @@ import com.google.android.apps.mytracks.fragments.MyTracksMapFragment;
 import com.google.android.maps.MapView;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
@@ -37,7 +36,6 @@ public class ViewsTest extends ActivityInstrumentationTestCase2<TrackListActivit
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
 
-  @TargetApi(8)
   public ViewsTest() {
     super(TrackListActivity.class);
   }
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 1035763f8..c610fd651 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
@@ -15,7 +15,8 @@
  */
 package com.google.android.apps.mytracks.io.backup;
 
-import android.annotation.TargetApi;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
+
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.test.AndroidTestCase;
@@ -175,7 +176,6 @@ public class PreferenceBackupHelperTest extends AndroidTestCase {
     preferenceBackupHelper = new PreferenceBackupHelper(getContext());
   }
 
-  @TargetApi(9)
   public void testExportImportPreferences() throws Exception {
     // Populate with some initial values
     Editor editor = preferences.edit();
@@ -186,7 +186,7 @@ public class PreferenceBackupHelperTest extends AndroidTestCase {
     editor.putInt("int1", 42);
     editor.putLong("long1", 123456789L);
     editor.putString("str1", "lolcat");
-    editor.apply();
+    ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor);
 
     // Export it
     byte[] exported = preferenceBackupHelper.exportPreferences(preferences);
@@ -196,7 +196,7 @@ public class PreferenceBackupHelperTest extends AndroidTestCase {
     editor.clear();
     editor.putString("str2", "Shouldn't be there after restore");
     editor.putBoolean("bool2", true);
-    editor.apply();
+    ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor);
 
     // Import it back
     preferenceBackupHelper.importPreferences(exported, preferences);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java
index 9301ca814..a9d6e8cd5 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java
@@ -19,7 +19,6 @@ import com.google.android.apps.mytracks.content.DescriptionGenerator;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 
-import android.annotation.TargetApi;
 import android.location.Location;
 
 import java.util.List;
@@ -113,7 +112,6 @@ public class KmlTrackWriterTest extends TrackFormatWriterTest {
    * @param tag the parent tag
    * @param locations list of expected locations
    */
-  @TargetApi(8)
   private void assertTagHasPoints(Element tag, Location... locations) {
     List<Element> coordTags = getChildElements(tag, "gx:coord", locations.length);
     for (int i = 0; i < locations.length; i++) {
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java
index 86be38e32..8c6ba5d13 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java
@@ -18,7 +18,6 @@ package com.google.android.apps.mytracks.io.maps;
 import com.google.android.apps.mytracks.io.gdata.maps.MapsMapMetadata;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.content.Intent;
 import android.test.AndroidTestCase;
 import android.widget.ArrayAdapter;
@@ -47,7 +46,6 @@ public class ChooseMapActivityTest extends AndroidTestCase {
    * 
    * @author youtaol
    */
-  @TargetApi(11)
   public class ChooseMapActivityMock extends ChooseMapActivity {
     /**
      * By overriding this method, avoids to start next activity.
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java
index d06b1b23b..7ea9fb3d9 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java
@@ -18,7 +18,6 @@ package com.google.android.apps.mytracks.io.sendtogoogle;
 
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
@@ -50,7 +49,6 @@ public class UploadResultActivityTest extends
   /**
    * This method is necessary for ActivityInstrumentationTestCase2.
    */
-  @TargetApi(8)
   public UploadResultActivityTest() {
     super(UploadResultActivity.class);
   }
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 4fa2095aa..d42eca220 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
@@ -24,10 +24,10 @@ import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.stats.TripStatistics;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -126,7 +126,6 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     super.shutdownService();
   }
 
-  @TargetApi(9)
   @Override
   protected void setUp() throws Exception {
     super.setUp();
@@ -195,7 +194,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     SharedPreferences sharedPreferences = context.getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     // Let's use default values.
-    sharedPreferences.edit().clear().apply();
+    ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(sharedPreferences.edit().clear());
 
     // Disable auto resume by default.
     updateAutoResumePrefs(PreferencesUtils.AUTO_RESUME_TRACK_CURRENT_RETRY_DEFAULT, 0);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
index 4614a8520..bcc6fe555 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
@@ -1,10 +1,7 @@
 package com.google.android.apps.mytracks.services.sensors;
 
 import com.google.android.apps.mytracks.content.Sensor;
-
-import android.annotation.TargetApi;
-
-import java.util.Arrays;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 
 import junit.framework.TestCase;
 
@@ -17,10 +14,9 @@ public class PolarMessageParserTest extends TestCase {
     {(byte) 0xFE, 0x08, (byte) 0xF7, 0x01, (byte) 0xD1, 0x00, 0x11, 0x04, (byte) 0xFE, 0x08,
      (byte) 0xF7, 0x02, (byte) 0xD1, 0x00, 0x11, 0x04};
   private byte[] buf;
-  
-  @TargetApi(9)
+
   public void setUp() {
-    buf = Arrays.copyOf(originalBuf, originalBuf.length);
+    buf = ApiAdapterFactory.getApiAdapter().copyByteArray(originalBuf, 0, originalBuf.length);
   }
 
   public void testIsValid() {
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 8fbe8b657..4c920bb59 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
@@ -1,10 +1,10 @@
 package com.google.android.apps.mytracks.services.sensors;
 
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.maps.mytracks.R;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.test.AndroidTestCase;
@@ -12,7 +12,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 public class SensorManagerFactoryTest extends AndroidTestCase {
 
-  @TargetApi(9)
   @Override
   protected void setUp() throws Exception {
     super.setUp();
@@ -20,7 +19,7 @@ public class SensorManagerFactoryTest extends AndroidTestCase {
     SharedPreferences sharedPreferences = getContext().getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     // Let's use default values.
-    sharedPreferences.edit().clear().apply();
+    ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(sharedPreferences.edit().clear());
   }
 
   @SmallTest