4 files changed, 14 insertions, 592 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java
deleted file mode 100644
index d37c6db2d5..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.maps.widgets;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.net.Uri;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.intent.Intents;
-import android.text.Html;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.text.style.URLSpan;
-import android.view.View;
-
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.style.sources.Source;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
-
-import org.hamcrest.Matcher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static android.support.test.espresso.Espresso.onData;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.intent.Intents.intended;
-import static android.support.test.espresso.intent.Intents.intending;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasAction;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasData;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.anything;
-import static org.hamcrest.core.IsNot.not;
-
-public class AttributionTest extends BaseActivityTest {
-
-  private URLSpan[] urlSpans;
-
-  @Override
-  protected Class getActivityClass() {
-    return EspressoTestActivity.class;
-  }
-
-  @Before
-  public void beforeTest() {
-    super.beforeTest();
-    Intents.init();
-  }
-
-  @Test
-  public void testDisabled() {
-    validateTestSetup();
-
-    // Default
-    onView(withId(R.id.attributionView)).check(matches(isDisplayed()));
-
-    // Disabled
-    onView(withId(R.id.attributionView))
-      .perform(new DisableAction(mapboxMap))
-      .check(matches(not(isDisplayed())));
-  }
-
-  @Test
-  public void testMapboxStreetsMapboxAttributionLink() {
-    validateTestSetup();
-    if (urlSpans == null) {
-      buildUrlSpans();
-    }
-
-    // click on View to open dialog
-    onView(withId(R.id.attributionView)).perform(click());
-    onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed()));
-
-    // test for trigger url intent
-    Matcher<Intent> expectedIntent = allOf(hasAction(Intent.ACTION_VIEW), hasData(Uri.parse(urlSpans[0].getURL())));
-    intending(expectedIntent).respondWith(new Instrumentation.ActivityResult(0, null));
-
-    // click item and test for url
-    onData(anything()).inAdapterView(withId(R.id.select_dialog_listview)).atPosition(0).perform(click());
-    intended(expectedIntent);
-  }
-
-  @Test
-  public void testMapboxStreetsOpenStreetMapAttributionLink() {
-    validateTestSetup();
-    if (urlSpans == null) {
-      buildUrlSpans();
-    }
-
-    // click on View to open dialog
-    onView(withId(R.id.attributionView)).perform(click());
-    onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed()));
-
-    // test for trigger url intent
-    Matcher<Intent> expectedIntent = allOf(hasAction(Intent.ACTION_VIEW), hasData(Uri.parse(urlSpans[1].getURL())));
-    intending(expectedIntent).respondWith(new Instrumentation.ActivityResult(0, null));
-
-    // click item and test for url
-    onData(anything()).inAdapterView(withId(R.id.select_dialog_listview)).atPosition(1).perform(click());
-    intended(expectedIntent);
-  }
-
-  @Test
-  public void testImproveMapLink() {
-    validateTestSetup();
-    if (urlSpans == null) {
-      buildUrlSpans();
-    }
-
-    // click on View to open dialog
-    onView(withId(R.id.attributionView)).perform(click());
-    onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed()));
-
-    // test for trigger url intent
-    Matcher<Intent> expectedIntent = hasAction(Intent.ACTION_VIEW);
-    intending(expectedIntent).respondWith(new Instrumentation.ActivityResult(0, null));
-
-    // click item and test for url
-    onData(anything()).inAdapterView(withId(R.id.select_dialog_listview)).atPosition(2).perform(click());
-    intended(expectedIntent);
-  }
-
-  @Test
-  public void testTelemetryDialog() {
-    validateTestSetup();
-
-    // click on View to open dialog
-    onView(withId(R.id.attributionView)).perform(click());
-    onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed()));
-
-    // click on item to open second dialog
-    onView(withText(R.string.mapbox_telemetrySettings)).perform(click());
-    onView(withText(R.string.mapbox_attributionTelemetryTitle)).check(matches(isDisplayed()));
-  }
-
-  @After
-  public void afterTest() {
-    super.afterTest();
-    Intents.release();
-  }
-
-  private void buildUrlSpans() {
-    onView(withId(R.id.mapView)).perform(new MapboxMapAction(new InvokeViewAction() {
-      @Override
-      public void onViewAction(UiController uiController, View view) {
-        for (Source source : mapboxMap.getSources()) {
-          String attributionSource = source.getAttribution();
-          if (!TextUtils.isEmpty(attributionSource)) {
-            SpannableStringBuilder htmlBuilder = (SpannableStringBuilder) Html.fromHtml(attributionSource);
-            urlSpans = htmlBuilder.getSpans(0, htmlBuilder.length(), URLSpan.class);
-          }
-        }
-      }
-    }));
-  }
-
-  private class DisableAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-
-    DisableAction(MapboxMap map) {
-      mapboxMap = map;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.getUiSettings().setAttributionEnabled(false);
-    }
-  }
-
-  private class MapboxMapAction implements ViewAction {
-
-    private InvokeViewAction invokeViewAction;
-
-    MapboxMapAction(InvokeViewAction invokeViewAction) {
-      this.invokeViewAction = invokeViewAction;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      invokeViewAction.onViewAction(uiController, view);
-    }
-  }
-
-  interface InvokeViewAction {
-    void onViewAction(UiController uiController, View view);
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
deleted file mode 100644
index f15605042b..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/CompassViewTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.maps.widgets;
-
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
-
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
-import com.mapbox.mapboxsdk.testapp.utils.TestConstants;
-
-import org.hamcrest.Matcher;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-
-public class CompassViewTest extends BaseActivityTest {
-
-  @Override
-  protected Class getActivityClass() {
-    return EspressoTestActivity.class;
-  }
-
-  @Test
-  public void testDefault() {
-    validateTestSetup();
-    onView(withId(R.id.compassView)).check(matches(not(isDisplayed())));
-  }
-
-  @Test
-  public void testVisible() {
-    validateTestSetup();
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap,
-        CameraUpdateFactory.newCameraPosition(
-          new CameraPosition.Builder()
-            .bearing(45)
-            .zoom(1)
-            .target(new LatLng())
-            .build()
-        )
-      )
-    );
-    waitLoop();
-    onView(withId(R.id.compassView)).check(matches(isDisplayed()));
-  }
-
-  @Test
-  @Ignore // 10-31-2016 click action is not working
-  public void testClick() {
-    validateTestSetup();
-
-    onView(withId(R.id.mapView)).perform(new MoveCameraAction(mapboxMap,
-        CameraUpdateFactory.newCameraPosition(
-          new CameraPosition.Builder()
-            .bearing(45)
-            .zoom(1)
-            .target(new LatLng())
-            .build()
-        )
-      )
-    );
-
-    waitLoop();
-    onView(withId(R.id.compassView)).perform(click());
-    onView(withId(R.id.mapView)).perform(new WaitAction(3000));
-    onView(withId(R.id.compassView)).check(matches(not(isDisplayed())));
-
-    CameraPosition cameraPosition = mapboxMap.getCameraPosition();
-    assertEquals("Camera bearing should face north, ", 0, cameraPosition.bearing, TestConstants.BEARING_DELTA);
-  }
-
-  private class WaitAction implements ViewAction {
-
-    private long waitTime;
-
-    WaitAction(long waitTime) {
-      this.waitTime = waitTime;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      uiController.loopMainThreadForAtLeast(waitTime);
-    }
-  }
-
-  private class MoveCameraAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private CameraUpdate cameraUpdate;
-
-    MoveCameraAction(MapboxMap map, CameraUpdate update) {
-      mapboxMap = map;
-      cameraUpdate = update;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.moveCamera(cameraUpdate);
-    }
-  }
-}
-
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/FillExtrusionTest.java
index 0c189aa316..1b613966f7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/LogoTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/FillExtrusionTest.java
@@ -4,10 +4,12 @@ import android.support.test.espresso.UiController;
 import android.support.test.espresso.ViewAction;
 import android.view.View;
 
+import com.mapbox.mapboxsdk.maps.MapViewUtils;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
+import com.mapbox.mapboxsdk.testapp.activity.style.FillExtrusionActivity;
 
 import org.hamcrest.Matcher;
 import org.junit.Test;
@@ -18,33 +20,24 @@ import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static org.hamcrest.Matchers.not;
 
-public class LogoTest extends BaseActivityTest {
+public class FillExtrusionTest extends BaseActivityTest {
 
   @Override
   protected Class getActivityClass() {
-    return EspressoTestActivity.class;
+    return FillExtrusionActivity.class;
   }
 
   @Test
-  public void testDefault() {
+  public void testRotate() {
     validateTestSetup();
-    onView(withId(R.id.logoView)).check(matches(isDisplayed()));
+    onView(withId(R.id.mapView)).perform(new RotateAction(mapboxMap));
   }
 
-  @Test
-  public void testDisabled() {
-    validateTestSetup();
-
-    onView(withId(R.id.logoView))
-      .perform(new DisableAction(mapboxMap))
-      .check(matches(not(isDisplayed())));
-  }
-
-  private class DisableAction implements ViewAction {
+  private class RotateAction implements ViewAction {
 
     private MapboxMap mapboxMap;
 
-    DisableAction(MapboxMap map) {
+    RotateAction(MapboxMap map) {
       mapboxMap = map;
     }
 
@@ -60,7 +53,12 @@ public class LogoTest extends BaseActivityTest {
 
     @Override
     public void perform(UiController uiController, View view) {
-      mapboxMap.getUiSettings().setLogoEnabled(false);
+      int i = 0;
+      while(i < 360){
+        MapViewUtils.setDirection(mapboxMap, i);
+        i += 5;
+        uiController.loopMainThreadForAtLeast(20);
+      }
     }
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/MyLocationViewTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/MyLocationViewTest.java
deleted file mode 100644
index efd67db356..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/MyLocationViewTest.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.maps.widgets;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.view.View;
-
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MyBearingTracking;
-import com.mapbox.mapboxsdk.constants.MyLocationTracking;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.location.LocationSource;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
-import com.mapbox.mapboxsdk.testapp.R;
-import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
-import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static org.hamcrest.Matchers.not;
-
-/**
- * Experimental MyLocationView tests,
- * requires application to be granted with runtime location permissions.
- * <p>
- * Tests for enabling and disabling the {@link MyLocationView}.
- * Tests for enabling tracking modes and if the correct default images are shown when toggling
- * {@link com.mapbox.mapboxsdk.maps.TrackingSettings#setMyLocationTrackingMode(int)} &
- * {@link com.mapbox.mapboxsdk.maps.TrackingSettings#setMyBearingTrackingMode(int)}.
- * </p>
- */
-public class MyLocationViewTest extends BaseActivityTest {
-
-  @Override
-  protected Class getActivityClass() {
-    return EspressoTestActivity.class;
-  }
-
-  @Test
-  @Ignore // requires runtime permissions, disabled for CI
-  public void testEnabled() {
-    validateTestSetup();
-    onView(withId(R.id.userLocationView)).check(matches(not(isDisplayed())));
-    onView(withId(R.id.mapView)).perform(new ToggleLocationAction(mapboxMap, true));
-    onView(withId(R.id.userLocationView)).check(matches(isDisplayed()));
-    onView(withId(R.id.mapView)).perform(new ToggleLocationAction(mapboxMap, false));
-    onView(withId(R.id.userLocationView)).check(matches(not(isDisplayed())));
-  }
-
-  @Test
-  @Ignore
-  // requires runtime permissions, disabled for CI + issue with android.support.test.espresso.AppNotIdleException:
-  // Looped for 5049 iterations over 60 SECONDS.
-  public void testTracking() {
-    validateTestSetup();
-    onView(withId(R.id.userLocationView)).check(matches(not(isDisplayed())));
-    onView(withId(R.id.mapView)).perform(new EnableLocationTrackingAction(mapboxMap));
-    onView(withId(R.id.userLocationView)).check(matches(isDisplayed()));
-    onView(withId(R.id.userLocationView)).check(matches(new DrawableMatcher(mapboxMap,
-      R.drawable.mapbox_mylocation_icon_default, false)));
-    onView(withId(R.id.mapView)).perform(new EnableCompassBearingTrackingAction(mapboxMap));
-    onView(withId(R.id.userLocationView)).check(matches(new DrawableMatcher(mapboxMap,
-      R.drawable.mapbox_mylocation_icon_bearing, true)));
-  }
-
-  private class ToggleLocationAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-    private boolean isEnabled;
-
-    ToggleLocationAction(MapboxMap map, boolean enable) {
-      mapboxMap = map;
-      isEnabled = enable;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      if (isEnabled) {
-        // move camera above user location
-        mapboxMap.moveCamera(
-          CameraUpdateFactory.newCameraPosition(
-            new CameraPosition.Builder()
-              .target(new LatLng(LocationSource.getLocationEngine(view.getContext()).getLastLocation()))
-              .build()
-          )
-        );
-      }
-
-      // show loction on screen
-      mapboxMap.setMyLocationEnabled(isEnabled);
-    }
-  }
-
-  private class EnableLocationTrackingAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-
-    EnableLocationTrackingAction(MapboxMap map) {
-      mapboxMap = map;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.getTrackingSettings().setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
-    }
-  }
-
-  private class EnableCompassBearingTrackingAction implements ViewAction {
-
-    private MapboxMap mapboxMap;
-
-    EnableCompassBearingTrackingAction(MapboxMap map) {
-      mapboxMap = map;
-    }
-
-    @Override
-    public Matcher<View> getConstraints() {
-      return isDisplayed();
-    }
-
-    @Override
-    public String getDescription() {
-      return getClass().getSimpleName();
-    }
-
-    @Override
-    public void perform(UiController uiController, View view) {
-      mapboxMap.getTrackingSettings().setMyBearingTrackingMode(MyBearingTracking.COMPASS);
-      // wait for next compass update cycle
-      uiController.loopMainThreadForAtLeast(500);
-    }
-  }
-
-  private class DrawableMatcher extends TypeSafeMatcher<View> {
-
-    private MapboxMap mapboxMap;
-    private boolean isBearingDrawable;
-    private final int expectedId;
-
-    DrawableMatcher(MapboxMap mapboxMap, int expectedId, boolean isBearingDrawable) {
-      super(MyLocationView.class);
-      this.mapboxMap = mapboxMap;
-      this.expectedId = expectedId;
-      this.isBearingDrawable = isBearingDrawable;
-    }
-
-    @Override
-    protected boolean matchesSafely(View target) {
-      Drawable currentDrawable = isBearingDrawable
-        ? mapboxMap.getMyLocationViewSettings().getForegroundBearingDrawable() :
-        mapboxMap.getMyLocationViewSettings().getForegroundDrawable();
-
-      Resources resources = target.getContext().getResources();
-      Drawable expectedDrawable = resources.getDrawable(expectedId);
-      return areDrawablesIdentical(currentDrawable, expectedDrawable);
-    }
-
-    @Override
-    public void describeTo(Description description) {
-      description.appendText("trying to match MyLocationView drawable to " + expectedId);
-    }
-
-    boolean areDrawablesIdentical(Drawable drawableA, Drawable drawableB) {
-      Drawable.ConstantState stateA = drawableA.getConstantState();
-      Drawable.ConstantState stateB = drawableB.getConstantState();
-      return (stateA != null && stateB != null && stateA.equals(stateB))
-        || getBitmap(drawableA).sameAs(getBitmap(drawableB));
-    }
-
-    Bitmap getBitmap(Drawable drawable) {
-      Bitmap result;
-      if (drawable instanceof BitmapDrawable) {
-        result = ((BitmapDrawable) drawable).getBitmap();
-      } else {
-        int width = drawable.getIntrinsicWidth();
-        int height = drawable.getIntrinsicHeight();
-        // Some drawables have no intrinsic width - e.g. solid colours.
-        if (width <= 0) {
-          width = 1;
-        }
-        if (height <= 0) {
-          height = 1;
-        }
-
-        result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(result);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-      }
-      return result;
-    }
-  }
-}