Merge branch 'BlueGPS4Droid_1.2.x' into HEAD

4 files changed, 21 insertions, 3 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 81400f3..f751a43 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
 -->

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

       package="org.broeuschmeul.android.gps.bluetooth.provider"

-      android:versionCode="121"

+      android:versionCode="122"

       android:versionName="@string/versionName">

     <application android:icon="@drawable/ic_launcher_bluegps" android:label="@string/app_name" android:allowClearUserData="true">

         <activity android:name=".BluetoothGpsActivity"

diff --git a/readme.textile b/readme.textile
index 5c8f417..045fe86 100644
--- a/readme.textile
+++ b/readme.textile
@@ -1,4 +1,13 @@
-*BlueGps4Droid 1.2.1* (2011-01-20)

+*BlueGps4Droid 1.2.2* (2011-05-14)

+* Add an option to force auto-activation of the chosen location provider (useful when the device defines a GPS provider but doesn't provide the preferences used to enable/disable it).

+* Update copyright infos.

+* Decrease the alleged power consumption of the bluetooth GPS (so now bluetooth GPS should consume less power than internal GPS).

+* Change default retries number before auto-closing BlueGPS4Droid. 

+* Bug fix (Ticket #5: "BlueGPS loops forever when SIRF is enabled but connection cannot be established":https://sourceforge.net/p/bluegps4droid/tickets/5/). 

+* Bug fixed (Ticket #6: "Cannot add mock provider if it exists already":https://sourceforge.net/p/bluegps4droid/tickets/6/). 

+* Closing of bluetooth connection improvements. 

+

+BlueGps4Droid 1.2.1 (2011-01-20)

 * Add Spanish translation (thanks to "Colegota - XDA-Developers":http://forum.xda-developers.com/showpost.php?p=10628971&postcount=55 )

 * Change launcher and notification icons.  The new icons are inspired from "XlAfbk's proposition":http://forum.xda-developers.com/showpost.php?p=10277778&postcount=29.

 

diff --git a/res/values/constants.xml b/res/values/constants.xml
index 25f50fc..a56e393 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -19,7 +19,7 @@
 	along with BluetoothGPS4Droid. If not, see : http://www.gnu.org/licenses/.

 -->

 <resources>

-	<string name="versionName">1.2.1</string>

+	<string name="versionName">1.2.2</string>

 

     <string name="pref_start_gps_key">startGps</string>

     <string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>

diff --git a/version.txt b/version.txt
index 1f44116..299bc31 100644
--- a/version.txt
+++ b/version.txt
@@ -1,3 +1,12 @@
+BlueGps4Droid 1.2.2 (2011-05-14)

+	* Add an option to force auto-activation of the chosen location provider (useful when the device defines a GPS provider but doesn't provide the preferences used to enable/disable it).

+	* Update copyright infos.

+	* Decrease the alleged power consumption of the bluetooth GPS (so now bluetooth GPS should consume less power than internal GPS).

+	* Change default retries number before auto-closing BlueGPS4Droid. 

+	* Bug fix (Ticket #5: BlueGPS loops forever when SIRF is enabled but connection cannot be established https://sourceforge.net/p/bluegps4droid/tickets/5/). 

+	* Bug fixed (Ticket #6: Cannot add mock provider if it exists already https://sourceforge.net/p/bluegps4droid/tickets/6/). 

+	* Closing of bluetooth connection improvements. 

+

 BlueGps4Droid 1.2.1 (2011-01-20)

 	* Add Spanish translation (thanks to Colegota - XDA-Developers: http://forum.xda-developers.com/showpost.php?p=10628971&postcount=55 )

 	* Change launcher and notification icons.  The new icons are inspired from XlAfbk's proposition: http://forum.xda-developers.com/showpost.php?p=10277778&postcount=29