Merge branch 'release/1.2'

SvenDub · Apr 26, 2015 · 5c73ed6 · 5c73ed6
2 parents 126e2e0 + 9a764b2
commit 5c73ed6
Show file tree

Hide file tree

Showing 36 changed files with 1,167 additions and 650 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,8 +36,8 @@ android {
         applicationId "nl.svendubbeld.car"
         minSdkVersion 21
         targetSdkVersion 22
-        versionCode 3
-        versionName "1.1"
+        versionCode 4
+        versionName "1.2"
     }
     signingConfigs {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,25 +21,26 @@
   ~ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   -->
 
-<manifest package="nl.svendubbeld.car"
+<manifest
+    package="nl.svendubbeld.car"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
 
     <uses-feature
         android:name="android.hardware.telephony"
         android:required="false"/>
 
     <uses-feature
         android:glEsVersion="0x00020000"
-        android:required="true" />
+        android:required="true"/>
 
     <application
         android:allowBackup="true"
@@ -52,79 +53,80 @@
             android:exported="true"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
-                <action android:name="android.service.notification.NotificationListenerService" />
+                <action android:name="android.service.notification.NotificationListenerService"/>
             </intent-filter>
         </service>
 
         <activity
             android:name=".activity.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName=".activity.CarActivity" />
+            android:parentActivityName=".activity.CarActivity"/>
         <activity
             android:name=".activity.CarActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask">
             <meta-data
                 android:name="android.dock_home"
-                android:value="true" />
+                android:value="true"/>
             <intent-filter
                 android:icon="@mipmap/ic_launcher"
                 android:label="@string/app_name">
-                <category android:name="android.intent.category.CAR_DOCK" />
-                <category android:name="android.intent.category.CAR_MODE" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.CAR_DOCK"/>
+                <category android:name="android.intent.category.CAR_MODE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
         <activity android:name=".activity.MainActivity">
             <intent-filter
                 android:icon="@mipmap/ic_launcher"
                 android:label="@string/app_name">
                 <category android:name="android.intent.category.LAUNCHER"/>
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
         <activity
             android:name=".activity.MediaActivity"
-            android:parentActivityName=".activity.CarActivity" />
+            android:parentActivityName=".activity.CarActivity"/>
         <activity
             android:name=".activity.DialerActivity"
-            android:parentActivityName=".activity.CarActivity" />
+            android:parentActivityName=".activity.CarActivity"/>
         <activity
             android:name=".activity.NavigationActivity"
             android:parentActivityName=".activity.CarActivity"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan"/>
         <activity
             android:name=".activity.NavigationFavoritesPreferenceActivity"
-            android:parentActivityName=".activity.SettingsActivity" />
+            android:label="@string/navigation_favorites"
+            android:parentActivityName=".activity.SettingsActivity"/>
 
         <service
             android:name=".service.VoiceAccessibilityService"
             android:enabled="true"
             android:exported="true"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService" />
+                <action android:name="android.accessibilityservice.AccessibilityService"/>
             </intent-filter>
 
             <meta-data
                 android:name="android.accessibilityservice"
-                android:resource="@xml/accessibility_service" />
+                android:resource="@xml/accessibility_service"/>
         </service>
         <service
             android:name=".service.FetchAddressIntentService"
-            android:exported="false" />
+            android:exported="false"/>
 
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+            android:value="@integer/google_play_services_version"/>
 
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
-            android:value="AIzaSyBTV4U3qoO9Zv8Udk6EVVxSV31WGnqr7JQ" />
+            android:value="AIzaSyBTV4U3qoO9Zv8Udk6EVVxSV31WGnqr7JQ"/>
 
     </application>
 </manifest>
diff --git a/app/src/main/java/nl/svendubbeld/car/OnTargetChangeListener.java b/app/src/main/java/nl/svendubbeld/car/OnTargetChangeListener.java
@@ -0,0 +1,28 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Sven Dubbeld
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nl.svendubbeld.car;
+
+public interface OnTargetChangeListener {
+    void onTargetChanged(String target);
+}