forked from upstream-mirrors/OpenTracks
Merge heads
This commit is contained in:
@@ -24,28 +24,6 @@ limitations under the License.
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="8dp" >
|
||||
<LinearLayout
|
||||
android:id="@+id/marker_edit_type_section"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical" >
|
||||
<TextView
|
||||
android:text="@string/marker_type"
|
||||
style="@style/EditLabel" />
|
||||
<RadioGroup
|
||||
android:id="@+id/marker_edit_type"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content" >
|
||||
<RadioButton
|
||||
android:id="@+id/marker_edit_statistics"
|
||||
android:text="@string/marker_statistics"
|
||||
style="@style/TextMedium" />
|
||||
<RadioButton
|
||||
android:id="@+id/marker_edit_waypoint"
|
||||
android:text="@string/marker_waypoint"
|
||||
style="@style/TextMedium" />
|
||||
</RadioGroup>
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:text="@string/generic_name"
|
||||
style="@style/EditLabel" />
|
||||
@@ -73,10 +51,10 @@ limitations under the License.
|
||||
android:imeOptions="actionNext"
|
||||
style="@style/EditName" />
|
||||
<TextView
|
||||
android:text="@string/marker_edit_waypoint_marker_type"
|
||||
android:text="@string/marker_edit_marker_type"
|
||||
style="@style/EditLabel.WithPaddingTop" />
|
||||
<AutoCompleteTextView
|
||||
android:hint="@string/marker_edit_waypoint_marker_type_hint"
|
||||
android:hint="@string/marker_edit_marker_type_hint"
|
||||
android:id="@+id/marker_edit_waypoint_marker_type"
|
||||
android:imeOptions="actionNext"
|
||||
style="@style/EditCategory" />
|
||||
|
||||
Reference in New Issue
Block a user