diff options
| author | Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com> | 2010-12-03 21:19:52 +0100 |
|---|---|---|
| committer | Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com> | 2010-12-03 21:20:46 +0100 |
| commit | a5803e71abea27294c049ae53df080defe73307f (patch) | |
| tree | bf7d36b02daa86c8cc98da218c68598c48d75187 | |
| parent | f223acbfd9d2e832211f65cad82a69c64b31c346 (diff) | |
| parent | cb9766dc05972ecd89b0d3fdb1755a8a6c4d039a (diff) | |
| download | BlueGPS-a5803e71abea27294c049ae53df080defe73307f.zip BlueGPS-a5803e71abea27294c049ae53df080defe73307f.tar.gz BlueGPS-a5803e71abea27294c049ae53df080defe73307f.tar.bz2 | |
Merge branch '1.1.x' into 1.2.x
| -rw-r--r-- | res/layout/about.xml | 10 | ||||
| -rw-r--r-- | src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java | 5 |
2 files changed, 0 insertions, 15 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index b5b872d..3d6dddb 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -70,16 +70,6 @@ android:id="@+id/about_sources" style="@style/about_text" android:text="@string/about_sources" - /><!-- - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="16sp" - android:textSize="16sp" - android:textColor="?android:attr/textColorPrimary" - android:autoLink="web" - android:text="@string/about" /> - --> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java index 0551913..858a0a1 100644 --- a/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java +++ b/src/org/broeuschmeul/android/gps/bluetooth/provider/BluetoothGpsActivity.java @@ -160,11 +160,6 @@ public class BluetoothGpsActivity extends PreferenceActivity implements OnPrefer builder.setTitle(R.string.about_title);
builder.setIcon(R.drawable.gplv3_icon);
builder.setView(messageView);
-
-
-// CharSequence styledText = Html.fromHtml(getString(R.string.about));
-// builder.setMessage(R.string.about);
-// builder.setMessage(styledText);
builder.show();
}
|