diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-08-07 15:10:53 -0400 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2016-08-08 06:58:50 -0400 |
commit | d9873c045968d837fab20e9d695d24954ee13f8b (patch) | |
tree | 4efc1a1b14299f13413b8edc86498a5ddf2b5571 /platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java | |
parent | 91fd87f2a05ae310537f50d49e78c1da9b1285d6 (diff) | |
download | qtlocation-mapboxgl-d9873c045968d837fab20e9d695d24954ee13f8b.tar.gz |
[android] #5888 - handle location permissions for non User Location category features
[android] #5888 - setZMediaOverlay on overlain SurfaceView
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java index 66c51a1a13..a54e55529e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java @@ -3,18 +3,20 @@ package com.mapbox.mapboxsdk.testapp.model.activity; import android.os.Parcel; import android.os.Parcelable; -public class Feature implements Parcelable{ +public class Feature implements Parcelable { private String name; private String label; private String description; private String category; + private boolean requiresLocationPermission; - public Feature(String name, String label, String description, String category) { + public Feature(String name, String label, String description, String category, boolean requiresLocationPermission) { this.name = name; this.label = label; this.description = description; this.category = category; + this.requiresLocationPermission = requiresLocationPermission; } private Feature(Parcel in) { @@ -22,6 +24,7 @@ public class Feature implements Parcelable{ label = in.readString(); description = in.readString(); category = in.readString(); + requiresLocationPermission = in.readByte() != 0; } public String getName() { @@ -45,6 +48,10 @@ public class Feature implements Parcelable{ return category; } + public boolean isRequiresLocationPermission() { + return requiresLocationPermission; + } + public int describeContents() { return 0; } @@ -54,6 +61,7 @@ public class Feature implements Parcelable{ out.writeString(label); out.writeString(description); out.writeString(category); + out.writeByte((byte) (requiresLocationPermission ? 1 : 0)); } public static final Parcelable.Creator<Feature> CREATOR |