karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2012-05-01 18:05:53 -07:00
parent 52253afd3a
commit 66ba54ffa0
113 changed files with 1122 additions and 1956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/marker_edit.xml
+7 -10
View File
@@ -18,10 +18,7 @@ limitations under the License.
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical" >
<ScrollView
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="fill_parent" >
<ScrollView style="@style/ScrollView.WithBottomButtons" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -34,7 +31,7 @@ limitations under the License.
android:orientation="vertical" >
<TextView
android:text="@string/marker_edit_type"
style="@style/EditLabel" />
style="@style/TextMedium" />
<RadioGroup
android:id="@+id/marker_edit_type"
android:layout_height="wrap_content"
@@ -42,16 +39,16 @@ limitations under the License.
<RadioButton
android:id="@+id/marker_edit_type_statistics"
android:text="@string/marker_edit_type_statistics"
style="@style/EditLabel" />
style="@style/TextMedium" />
<RadioButton
android:id="@+id/marker_edit_type_waypoint"
android:text="@string/marker_edit_type_waypoint"
style="@style/EditLabel" />
style="@style/TextMedium" />
</RadioGroup>
</LinearLayout>
<TextView
android:text="@string/generic_name"
style="@style/EditLabel" />
style="@style/TextMedium" />
<EditText
android:hint="@string/generic_name"
android:id="@+id/marker_edit_name"
@@ -63,7 +60,7 @@ limitations under the License.
android:orientation="vertical" >
<TextView
android:text="@string/marker_edit_marker_type"
style="@style/EditLabel" />
style="@style/TextMedium" />
<AutoCompleteTextView
android:hint="@string/marker_edit_marker_type_hint"
android:id="@+id/marker_edit_marker_type"
@@ -71,7 +68,7 @@ limitations under the License.
style="@style/EditCategory" />
<TextView
android:text="@string/generic_description"
style="@style/EditLabel" />
style="@style/TextMedium" />
<EditText
android:hint="@string/generic_description"
android:id="@+id/marker_edit_description"