Remove unneeded @TargetApi

fix android lint errors
2012-11-06 15:51:38 -08:00
parent 903751c799
commit 6d2a642bc2
17 changed files with 17 additions and 43 deletions
@@ -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" />
@@ -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";

@@ -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);
  }
@@ -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);
  }
@@ -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);
  }
@@ -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);
  }
@@ -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);
  }
@@ -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);
  }
@@ -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);
  }
@@ -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);
  }
@@ -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);
@@ -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++) {
@@ -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.
@@ -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);
  }
@@ -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);
@@ -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() {
@@ -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