1 files changed, 58 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
index a1d5b13b8b..ec7c53e1d0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettings.java
@@ -1,18 +1,22 @@
 package com.mapbox.mapboxsdk.maps.widgets;
 
 import android.graphics.drawable.Drawable;
+import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 
 import com.mapbox.mapboxsdk.camera.CameraPosition;
+import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.constants.MyLocationTracking;
 import com.mapbox.mapboxsdk.maps.FocalPointChangeListener;
 import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
 import com.mapbox.mapboxsdk.maps.Projection;
+import com.mapbox.mapboxsdk.utils.BitmapUtils;
 
 /**
  * Settings to configure the visual appearance of the MyLocationView.
+ *
  * @deprecated use location layer plugin from
  * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugins/locationlayer instead.
  */
@@ -100,6 +104,56 @@ public class MyLocationViewSettings {
     setAccuracyThreshold(options.getMyLocationAccuracyThreshold());
   }
 
+  public void onSaveInstanceState(Bundle outState) {
+    outState.putBoolean(MapboxConstants.STATE_LOCATION_VIEW_ENABLED, isEnabled());
+    outState.putByteArray(
+      MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_DRAWABLE,
+      BitmapUtils.getByteArrayFromDrawable(getForegroundDrawable())
+    );
+    outState.putByteArray(
+      MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_BEARING_DRAWABLE,
+      BitmapUtils.getByteArrayFromDrawable(getForegroundBearingDrawable())
+    );
+    outState.putInt(MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_TINT_COLOR, getForegroundTintColor());
+    outState.putByteArray(
+      MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_DRAWABLE,
+      BitmapUtils.getByteArrayFromDrawable(getBackgroundDrawable())
+    );
+    outState.putIntArray(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_OFFSET, getBackgroundOffset());
+    outState.putInt(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_TINT_COLOR, getBackgroundTintColor());
+    outState.putInt(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_ALPHA, getAccuracyAlpha());
+    outState.putInt(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_TINT_COLOR, getAccuracyTintColor());
+    outState.putFloat(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_THRESHOLD, getAccuracyThreshold());
+    outState.putIntArray(MapboxConstants.STATE_LOCATION_VIEW_PADDING, getPadding());
+  }
+
+  public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+    setEnabled(savedInstanceState.getBoolean(MapboxConstants.STATE_LOCATION_VIEW_ENABLED));
+    setForegroundDrawable(
+      BitmapUtils.getDrawableFromByteArray(
+        myLocationView.getContext(),
+        savedInstanceState.getByteArray(MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_DRAWABLE)
+      ),
+      BitmapUtils.getDrawableFromByteArray(
+        myLocationView.getContext(),
+        savedInstanceState.getByteArray(MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_BEARING_DRAWABLE)
+      )
+    );
+    setForegroundTintColor(savedInstanceState.getInt(MapboxConstants.STATE_LOCATION_VIEW_FOREGROUND_TINT_COLOR));
+    setBackgroundDrawable(
+      BitmapUtils.getDrawableFromByteArray(
+        myLocationView.getContext(),
+        savedInstanceState.getByteArray(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_DRAWABLE)
+      ),
+      savedInstanceState.getIntArray(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_OFFSET)
+    );
+    setBackgroundTintColor(savedInstanceState.getInt(MapboxConstants.STATE_LOCATION_VIEW_BACKGROUND_TINT_COLOR));
+    setAccuracyAlpha(savedInstanceState.getInt(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_ALPHA));
+    setAccuracyTintColor(savedInstanceState.getInt(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_TINT_COLOR));
+    setAccuracyThreshold(savedInstanceState.getFloat(MapboxConstants.STATE_LOCATION_VIEW_ACCURACY_THRESHOLD));
+    setPadding(savedInstanceState.getIntArray(MapboxConstants.STATE_LOCATION_VIEW_PADDING));
+  }
+
   /**
    * Returns if the MyLocationView is enabled
    *
@@ -246,6 +300,10 @@ public class MyLocationViewSettings {
    */
   public void setPadding(int left, int top, int right, int bottom) {
     padding = new int[] {left, top, right, bottom};
+    setPadding(padding);
+  }
+
+  private void setPadding(int[] padding) {
     myLocationView.setContentPadding(padding);
     projection.invalidateContentPadding(padding);
     invalidateFocalPointForTracking(myLocationView);