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:
youtaol
2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/about.xml
+1 -1
View File
@@ -22,7 +22,7 @@ limitations under the License.
android:orientation="vertical"
android:padding="8dp" >
<TextView
android:drawableLeft="@drawable/my_tracks_icon"
android:drawableLeft="@drawable/ic_launcher_my_tracks"
android:text="@string/about_copyright_notice"
style="@style/TextMedium.WithIcon" />
<TextView
MyTracks/res/layout/map.xml
+1 -1
View File
@@ -20,7 +20,7 @@ limitations under the License.
android:layout_width="match_parent" >
<TextView
android:background="@color/warning_background"
android:drawableLeft="@drawable/warning"
android:drawableLeft="@drawable/ic_warning"
android:gravity="left|center_vertical"
android:id="@+id/map_message"
android:layout_alignParentTop="true"
MyTracks/res/layout/marker_edit.xml
+2 -2
View File
@@ -33,7 +33,7 @@ limitations under the License.
android:layout_width="match_parent"
android:orientation="vertical" >
<EditText
android:drawableLeft="@drawable/yellow_pushpin"
android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
android:hint="@string/generic_name"
android:id="@+id/marker_edit_statistics_name"
android:imeOptions="actionDone"
@@ -45,7 +45,7 @@ limitations under the License.
android:layout_width="match_parent"
android:orientation="vertical" >
<EditText
android:drawableLeft="@drawable/blue_pushpin"
android:drawableLeft="@drawable/ic_marker_blue_pushpin"
android:hint="@string/generic_name"
android:id="@+id/marker_edit_waypoint_name"
android:imeOptions="actionNext"
MyTracks/res/layout/track_controller.xml
+1 -1
View File
@@ -62,7 +62,7 @@ limitations under the License.
android:layout_height="wrap_content"
android:layout_weight="10"
android:layout_width="0dp"
android:src="@drawable/btn_stop_0" />
android:src="@drawable/ic_button_stop_disabled" />
<View
android:layout_height="match_parent"
android:layout_weight="1"
MyTracks/res/layout/track_list.xml
-1
View File
@@ -29,7 +29,6 @@ limitations under the License.
android:layout_weight="1.0"
android:layout_width="match_parent"
android:text="@string/track_list_empty_message"
android:visibility="gone"
style="@style/ListEmptyTextView" >
</TextView>
<include layout="@layout/track_controller" />
MyTracks/res/layout/track_widget_4x1.xml
+2 -2
View File
@@ -27,7 +27,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_record_track"
android:id="@+id/track_widget_record_button"
android:src="@drawable/record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<LinearLayout
android:id="@+id/track_widget_stats_container"
@@ -92,7 +92,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_stop_recording"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/btn_stop_0"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"
MyTracks/res/layout/track_widget_4x2.xml
+2 -2
View File
@@ -140,7 +140,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_record_track"
android:id="@+id/track_widget_record_button"
android:src="@drawable/record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
@@ -148,7 +148,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_stop_recording"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/btn_stop_0"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"
MyTracks/res/layout/track_widget_4x3.xml
+2 -2
View File
@@ -140,7 +140,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_record_track"
android:id="@+id/track_widget_record_button"
android:src="@drawable/record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
@@ -148,7 +148,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_stop_recording"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/btn_stop_0"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"
MyTracks/res/layout/track_widget_4x4.xml
+2 -2
View File
@@ -144,7 +144,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_record_track"
android:id="@+id/track_widget_record_button"
android:src="@drawable/record_button"
android:src="@drawable/button_record"
style="@style/TrackWidgetButton" />
<TextView
android:id="@+id/track_widget_record_status"
@@ -152,7 +152,7 @@ limitations under the License.
<ImageButton
android:contentDescription="@string/icon_stop_recording"
android:id="@+id/track_widget_stop_button"
android:src="@drawable/btn_stop_0"
android:src="@drawable/ic_button_stop_disabled"
style="@style/TrackWidgetButton" />
<LinearLayout
android:layout_weight="1"