diff options
| author | Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com> | 2012-03-24 00:23:50 +0100 |
|---|---|---|
| committer | Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com> | 2012-03-24 00:23:50 +0100 |
| commit | 51b3eaf859c30629bfd8ccd67731e956a9fa5055 (patch) | |
| tree | 961f94c839e319759825073ab0c6e727bb32219a /res | |
| parent | 554287d89b230ed1a73d281a910fd233963a15ea (diff) | |
| parent | 2d9cef6b759014f55e1b2e91705b2ef146d07782 (diff) | |
| download | BlueGPS-51b3eaf859c30629bfd8ccd67731e956a9fa5055.zip BlueGPS-51b3eaf859c30629bfd8ccd67731e956a9fa5055.tar.gz BlueGPS-51b3eaf859c30629bfd8ccd67731e956a9fa5055.tar.bz2 | |
Merge remote-tracking branch 'origin/BlueGPS4Droid_1.2.x' into BlueGPS4Cupcake_1.2.x
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/about.xml | 13 | ||||
| -rw-r--r-- | res/values-fr/strings.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/pref.xml | 5 |
4 files changed, 28 insertions, 2 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index 8df16b9..92245f4 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -71,5 +71,16 @@ style="@style/about_text" android:text="@string/about_sources" /> + <TextView + android:id="@+id/about_bluetooth_license" + style="@style/about_text" + android:text="@string/about_bluetooth_license" + android:autoLink="none" + /> + <TextView + android:id="@+id/about_bluetooth_sources" + style="@style/about_text" + android:text="@string/about_bluetooth_sources" + /> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index d7d6294..93681bf 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -123,4 +123,10 @@ <string name="about_sources">Le code source est librement téléchargeable à partir du dépot Git sur le site web du projet :
http://sourceforge.net/p/bluegps4droid
</string>
+ <string name="about_bluetooth_license">Le support du Bluetooth est fournit par le projet <i>backport-android-bluetooth</i>
+ qui le diffuse sous les termes de la <a href="http://www.apache.org/licenses/LICENSE-2.0"><b>Licence Apache, Version 2.0</b></a>.
+ </string>
+ <string name="about_bluetooth_sources">Le code source du portage <i>backport-android-bluetooth</i> est téléchargeable à l\'adresse suivante :
+ http://code.google.com/p/backport-android-bluetooth
+ </string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml index 3b1e6a7..1889aec 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -123,4 +123,10 @@ <string name="about_sources">The source code is available from Git repository on the project website:
http://sourceforge.net/p/bluegps4droid
</string>
+ <string name="about_bluetooth_license">Bluetooth support is provided by the <i>backport-android-bluetooth package</i>,
+ which is open source software released under the <a href="http://www.apache.org/licenses/LICENSE-2.0"><b>Apache License, Version 2.0</b></a>.
+ </string>
+ <string name="about_bluetooth_sources">The <i>backport-android-bluetooth package</i> is available from:
+ http://code.google.com/p/backport-android-bluetooth
+ </string>
</resources>
diff --git a/res/xml/pref.xml b/res/xml/pref.xml index c1c21ff..9c869bf 100644 --- a/res/xml/pref.xml +++ b/res/xml/pref.xml @@ -16,7 +16,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with BluetoothGPS4Droid. If not, see : http://www.gnu.org/licenses/.
+ along with BluetoothGPS4Droid. If not, see <http://www.gnu.org/licenses/>..
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
@@ -88,6 +88,7 @@ <CheckBoxPreference
android:key="@string/pref_sirf_enable_gga_key"
android:enabled="false"
+ android:selectable="false"
android:persistent="true"
android:defaultValue="true"
android:title="@string/pref_enable_gga_title"
@@ -96,6 +97,7 @@ <CheckBoxPreference
android:key="@string/pref_sirf_enable_rmc_key"
android:enabled="false"
+ android:selectable="false"
android:persistent="true"
android:defaultValue="true"
android:title="@string/pref_enable_rmc_title"
@@ -145,6 +147,7 @@ <CheckBoxPreference
android:key="@string/pref_sirf_enable_nmea_key"
android:enabled="false"
+ android:selectable="false"
android:persistent="true"
android:defaultValue="true"
android:title="@string/pref_enable_nmea_title"
|