From 13e1a1cebb55dd478f70f1ab656df40334881a80 Mon Sep 17 00:00:00 2001 From: Adam Mills Date: Fri, 14 Sep 2018 18:34:01 -0400 Subject: [PATCH] Add support for Marker zIndex and tags API --- .../gms/maps/model/internal/IMarkerDelegate.aidl | 4 ++++ .../google/android/gms/maps/model/MarkerOptions.java | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl index d4eccf6d..ca2d2603 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl @@ -30,4 +30,8 @@ interface IMarkerDelegate { void setInfoWindowAnchor(float x, float y); void setAlpha(float alpha); float getAlpha(); + void setZIndex(float zIndex); + float getZIndex(); + void setTag(IObjectWrapper obj); + IObjectWrapper getTag(); } diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java index c40f88bc..a950cd34 100644 --- a/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java +++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java @@ -58,6 +58,8 @@ public class MarkerOptions extends AutoSafeParcelable { private float infoWindowAnchorV = 1F; @SafeParceled(14) private float alpha = 1F; + @SafeParceled(15) + private float zIndex = 0F; /** * Creates a new set of marker options. @@ -326,5 +328,14 @@ public class MarkerOptions extends AutoSafeParcelable { return this; } + public MarkerOptions zIndex(float zIndex) { + this.zIndex = zIndex; + return this; + } + + public float getZIndex() { + return this.zIndex; + } + public static Creator CREATOR = new AutoCreator(MarkerOptions.class); }