Merge branch 'develop' of s416084/find-my-tutor-android into master
This commit is contained in:
commit
faed9e05b7
@ -10,7 +10,7 @@ android {
|
||||
applicationId "com.uam.wmi.findmytutor"
|
||||
minSdkVersion 22
|
||||
targetSdkVersion 27
|
||||
versionCode 65
|
||||
versionCode 66
|
||||
versionName "1.0.0"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
|
@ -6,7 +6,6 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.location.Location;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.provider.Settings;
|
||||
|
||||
import com.mapbox.mapboxsdk.camera.CameraPosition;
|
||||
@ -92,7 +91,7 @@ public class MapUtils {
|
||||
public static void BatteryOptimizationsExceptionCheck(Context context) {
|
||||
if (shouldBatteryExclusionBeShown(getApplicationContext())) {
|
||||
PrefUtils.setBatteryExlusionInfoStatus(getApplicationContext(), false);
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
||||
builder.setTitle(R.string.batter_exclusions_title);
|
||||
builder.setMessage(R.string.batter_exclusions_message)
|
||||
@ -108,7 +107,6 @@ public class MapUtils {
|
||||
}).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Function for marker animation
|
||||
public static class LatLngEvaluator implements TypeEvaluator<LatLng> {
|
||||
|
Loading…
Reference in New Issue
Block a user