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/layout/about.xml | |
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/layout/about.xml')
-rw-r--r-- | res/layout/about.xml | 13 |
1 files changed, 12 insertions, 1 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> |