Fix CUTR-at-USF#449 - Targeted latest API version and updated looks u…

…sing new API options and removing options-button menu.
vreixo · Dec 23, 2014 · 324b691 · 324b691
1 parent d222ba1
commit 324b691
Show file tree

Hide file tree

Showing 14 changed files with 1,232 additions and 2,385 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 09 13:40:17 EDT 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+#Mon Dec 22 22:23:08 CET 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/opentripplanner-android/build.gradle b/opentripplanner-android/build.gradle
@@ -19,7 +19,7 @@ buildscript {
  mavenCentral()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
+ classpath 'com.android.tools.build:gradle:1.0.0'
  }
 }
 apply plugin: 'android'
@@ -37,14 +37,14 @@ repositories {
 }
 
 android {
- compileSdkVersion 19
+ compileSdkVersion 21
  buildToolsVersion "19.1.0"
 
  defaultConfig {
  versionCode 15
  versionName "2.1.2"
  minSdkVersion 8
- targetSdkVersion 13
+ targetSdkVersion 21
  }
 
  // http://stackoverflow.com/questions/20673625/gradle-0-7-0-duplicate-files-during-packaging-of-apk
@@ -111,7 +111,7 @@ tasks.whenTaskAdded { theTask ->
 }
 
 dependencies {
- compile 'com.android.support:support-v4:19.1.+'
+ compile 'com.android.support:support-v4:21.0.3'
  compile 'com.google.android.gms:play-services:3.2.65'
  compile 'com.fasterxml.jackson.core:jackson-core:2.4.1'
  compile 'com.fasterxml.jackson.core:jackson-annotations:2.4.1'

diff --git a/opentripplanner-android/src/main/java/edu/usf/cutr/opentripplanner/android/OTPApp.java b/opentripplanner-android/src/main/java/edu/usf/cutr/opentripplanner/android/OTPApp.java
@@ -181,6 +181,14 @@ public class OTPApp extends Application {
 
  public static final int COLOR_ROUTE_LINE = 0x7F0000FF;
 
+ public static final int OPTIMIZATION_QUICK = 0;
+
+ public static final int OPTIMIZATION_SAFE = 1;
+
+ public static final int OPTIMIZATION_TRANSFERS = 2;
+
+ public static final int OPTIMIZATION_TRIANGLE = 3;
+
  /**
  * Preference keys
  */