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-04-06 15:16:01 -07:00
parent d76eb44257
commit c97ae1e87f
53 changed files with 1445 additions and 1511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/mytracks_layout.xml
-19
View File
@@ -59,23 +59,4 @@ limitations under the License.
android:minHeight="80dp"
android:layout_gravity="center"/>
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="center"
android:paddingTop="10dp">
<LinearLayout
android:layout_width = "wrap_content"
android:layout_height= "wrap_content"
android:layout_weight="1"/>
<ImageButton
android:id="@+id/showOptions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:visibility="visible"
android:src="@android:drawable/ic_menu_more"/>
</LinearLayout>
</RelativeLayout>
MyTracks/res/layout/track_detail.xml → MyTracks/res/layout/track_edit.xml
+11 -11
View File
@@ -35,7 +35,7 @@ limitations under the License.
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/track_detail_track_name"
android:text="@string/track_edit_track_name"
/>
<LinearLayout
android:layout_height="wrap_content"
@@ -53,8 +53,8 @@ limitations under the License.
/>
<EditText
android:inputType="textAutoCorrect|textCapWords"
android:hint="@string/track_detail_track_name"
android:id="@+id/track_detail_track_name"
android:hint="@string/track_edit_track_name"
android:id="@+id/track_edit_track_name"
android:imeOptions="actionNext"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -65,24 +65,24 @@ limitations under the License.
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/track_detail_activity_type"
android:text="@string/track_edit_activity_type"
/>
<AutoCompleteTextView
android:id="@+id/track_detail_activity_type"
android:id="@+id/track_edit_activity_type"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:hint="@string/track_detail_activity_type_hint"
android:hint="@string/track_edit_activity_type_hint"
android:imeOptions="actionNext"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/track_detail_track_description"
android:text="@string/track_edit_track_description"
/>
<EditText
android:inputType="textAutoCorrect|textCapSentences"
android:hint="@string/track_detail_track_description"
android:id="@+id/track_detail_track_description"
android:hint="@string/track_edit_track_description"
android:id="@+id/track_edit_track_description"
android:imeOptions="actionDone"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
@@ -95,13 +95,13 @@ limitations under the License.
<LinearLayout style="@style/ButtonLayout">
<LinearLayout style="@style/ButtonSpacer"/>
<Button
android:id="@+id/track_detail_save"
android:id="@+id/track_edit_save"
android:layout_gravity="left"
android:text="@string/generic_save"
style="@style/Button"
/>
<Button
android:id="@+id/track_detail_cancel"
android:id="@+id/track_edit_cancel"
android:layout_gravity="right"
android:text="@string/generic_cancel"
style="@style/Button"