forked from upstream-mirrors/OpenTracks
Merge heads
This commit is contained in:
@@ -39,13 +39,15 @@ limitations under the License.
|
||||
android:layout_width="wrap_content"
|
||||
android:maxLines="2"
|
||||
android:paddingLeft="16dp"
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSmall" />
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSmall"
|
||||
style="@style/TextChooseActivity" />
|
||||
<TextView
|
||||
android:id="@+id/choose_activity_list_item_text2"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:maxLines="2"
|
||||
android:paddingLeft="16dp"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
android:textAppearance="?android:attr/textAppearanceListItemSmall"
|
||||
style="@style/TextChooseActivity" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -57,7 +57,7 @@ limitations under the License.
|
||||
android:hint="@string/marker_edit_marker_type_hint"
|
||||
android:id="@+id/marker_edit_waypoint_marker_type"
|
||||
android:imeOptions="actionNext"
|
||||
style="@style/EditCategoryMarker" />
|
||||
style="@style/EditCategory" />
|
||||
<TextView
|
||||
android:text="@string/generic_description"
|
||||
style="@style/EditLabel.WithPaddingTop" />
|
||||
|
||||
@@ -33,13 +33,14 @@ limitations under the License.
|
||||
android:imeOptions="actionNext"
|
||||
style="@style/EditNameTrack" />
|
||||
<TextView
|
||||
android:id="@+id/track_edit_activity_type_label"
|
||||
android:text="@string/track_edit_activity_type"
|
||||
style="@style/EditLabel.WithPaddingTop" />
|
||||
style="@style/EditLabel.WithIcon.WithPaddingTop" />
|
||||
<AutoCompleteTextView
|
||||
android:hint="@string/track_edit_activity_type_hint"
|
||||
android:id="@+id/track_edit_activity_type"
|
||||
android:imeOptions="actionNext"
|
||||
style="@style/EditCategoryTrack" />
|
||||
style="@style/EditCategory" />
|
||||
<TextView
|
||||
android:text="@string/generic_description"
|
||||
style="@style/EditLabel.WithPaddingTop" />
|
||||
|
||||
Reference in New Issue
Block a user