Merging to head + return early to fully ignore close locations.

This commit is contained in:
Sandor Dornbush
2011-01-11 14:06:06 -08:00
parent 9b31cd63a4
commit 24297e373c
10 changed files with 114 additions and 93 deletions
+23 -8
View File
@@ -41,8 +41,7 @@ limitations under the License.
</LinearLayout>
</TableRow>
<View
android:layout_height="2dip" />
<View android:layout_height="2dip" />
<TableRow>
<TextView
@@ -86,8 +85,7 @@ limitations under the License.
</LinearLayout>
</TableRow>
<View
android:layout_height="2dip" />
<View android:layout_height="2dip" />
<TableRow>
<TextView
@@ -106,8 +104,7 @@ limitations under the License.
android:textSize="20sp" />
</TableRow>
<View
android:layout_height="2dip" />
<View android:layout_height="2dip" />
<TableRow>
<TextView
@@ -126,7 +123,25 @@ limitations under the License.
android:textSize="18sp" />
</TableRow>
<View
android:layout_height="4dip" />
<View android:layout_height="2dip" />
<TableRow>
<TextView
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:layout_column="1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_privacy"
android:textSize="20sp" />
<TextView
android:autoLink="web"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_privacy_weburl"
android:textSize="18sp" />
</TableRow>
<View android:layout_height="4dip" />
</TableLayout>
+1
View File
@@ -21,6 +21,7 @@ limitations under the License.
<!-- About Dialog -->
<string name="about_googlegroups">mytracks@googlegroups.com</string>
<string name="about_weburl">mytracks.appspot.com</string>
<string name="about_privacy_weburl">m.google.com/privacy</string>
<string name="about_copyright_message">Copyright 2009 Google Inc.</string>
<string name="about_bart">Bartlomiej Niechwiej</string>
<string name="about_dylan">Dylan Casey</string>
+2 -1
View File
@@ -104,6 +104,7 @@ limitations under the License.
<string name="error">Error</string>
<string name="success">Success</string>
<string name="waypoint">Waypoint</string>
<string name="license">License</string>
<!-- Placemark labels for start and end of track -->
<string name="start">(Start)</string>
@@ -378,8 +379,8 @@ limitations under the License.
<string name="help">Help</string>
<string name="about_team">Team:</string>
<string name="about_version">Version:</string>
<string name="about_email">Support</string>
<string name="about_support">Support:</string>
<string name="about_privacy">Privacy:</string>
<!-- Send to Google -->
<string name="sendtogoogle_title">Send to...</string>