Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes #12

Merged
merged 5 commits into from
Apr 28, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<activity android:name=".activity.DisplayTrack" android:label="@string/displaytrack" />
<activity android:name=".activity.DisplayTrackMap" android:label="@string/displaytrackmap"></activity>

<service android:name=".service.gps.GPSLogger">
<service android:name=".service.gps.GPSLogger" android:exported="false">
<intent-filter>
<action android:name="me.guillaumin.android.osmtracker.intent.GPS_SERVICE" />
</intent-filter>
Expand Down
7 changes: 7 additions & 0 deletions lint.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="ExtraTranslation" severity="ignore" />
<issue id="HardcodedText" severity="ignore" />
<issue id="MissingTranslation" severity="ignore" />
<issue id="UnusedResources" severity="ignore" />
</lint>
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion res/layout-iw/tracklist_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ImageView android:src="@android:drawable/presence_online" android:layout_gravity="center_horizontal|center_vertical" android:layout_height="fill_parent" android:paddingLeft="3dp" android:id="@+id/trackmgr_item_statusicon" android:paddingRight="3dp" android:layout_marginLeft="3dp" android:layout_width="wrap_content"></ImageView>

<RelativeLayout android:layout_height="fill_parent"
android:gravity="right|center_vertical" android:layout_weight="1" android:layout_width="wrap_content">
android:gravity="right|center_vertical" android:layout_weight="1" android:layout_width="0dip">
<TextView style="@android:style/TextAppearance.Large" android:layout_width="wrap_content" android:id="@+id/trackmgr_item_nameordate" android:layout_height="wrap_content" android:text="{start_date}" android:layout_alignParentRight="true"></TextView>
<TextView style="@android:style/TextAppearance.Small" android:textStyle="bold" android:layout_width="wrap_content" android:id="@+id/trackmgr_item_waypoints" android:layout_height="wrap_content" android:text="@string/trackmgr_waypoints_count" android:layout_below="@+id/trackmgr_item_nameordate" android:layout_alignParentRight="true"></TextView>
<TextView style="@android:style/TextAppearance.Small" android:layout_width="wrap_content" android:id="@+id/trackmgr_item_wps" android:layout_height="wrap_content" android:text="{x}" android:layout_below="@+id/trackmgr_item_nameordate" android:layout_toLeftOf="@+id/trackmgr_item_waypoints" android:layout_marginRight="3dp"></TextView>
Expand Down
2 changes: 1 addition & 1 deletion res/layout/gpsstatus_record.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<TextView android:id="@+id/gpsstatus_record_tvAccuracy" android:text="@string/various_waiting_gps_fix"
android:layout_gravity="center_vertical|center_horizontal"
android:gravity="center" android:layout_height="fill_parent" android:layout_width="fill_parent" android:layout_weight="1"></TextView>
android:gravity="center" android:layout_height="fill_parent" android:layout_width="0dip" android:layout_weight="1"></TextView>
<ImageView android:id="@+id/gpsstatus_record_imgSatIndicator" android:src="@drawable/sat_indicator_off"
android:layout_gravity="center_vertical|center_horizontal" android:layout_width="wrap_content"
android:layout_height="fill_parent"></ImageView>
Expand Down
23 changes: 8 additions & 15 deletions res/layout/trackdetail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,16 @@

<LinearLayout android:gravity="bottom" android:id="@+id/trackdetail_buttons"
android:orientation="horizontal" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_alignParentBottom="true">
android:layout_height="wrap_content" android:layout_alignParentBottom="true"
android:background="@android:color/darker_gray" android:padding="3dp">

<LinearLayout android:orientation="horizontal"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:gravity="bottom" android:background="@android:color/darker_gray"
android:padding="3dp">
<Button android:id="@+id/trackdetail_btn_ok"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="@string/trackdetail_save" android:layout_weight="1" />


<Button android:id="@+id/trackdetail_btn_ok"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="@string/trackdetail_save" android:layout_weight="1" />

<Button android:id="@+id/trackdetail_btn_cancel"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="@android:R/string/cancel" android:layout_weight="1" />

</LinearLayout>
<Button android:id="@+id/trackdetail_btn_cancel"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:text="@android:R/string/cancel" android:layout_weight="1" />

</LinearLayout>

Expand Down
5 changes: 2 additions & 3 deletions res/layout/tracklist_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
android:gravity="left|center_vertical" android:layout_marginRight="5dp"/>

<RelativeLayout android:layout_height="fill_parent"
android:gravity="left|center_vertical" android:layout_width="wrap_content" android:layout_weight="1">
android:gravity="left|center_vertical" android:layout_width="0dip" android:layout_weight="1">

<TextView android:layout_height="wrap_content" android:id="@+id/trackmgr_item_nameordate"
android:text="{start_date}" android:layout_width="wrap_content" style="@android:style/TextAppearance.Large"
android:layout_weight="1" />
android:text="{start_date}" android:layout_width="wrap_content" style="@android:style/TextAppearance.Large"/>

<TextView android:layout_height="wrap_content" android:id="@+id/trackmgr_item_waypoints" android:layout_below="@+id/trackmgr_item_nameordate"
android:textStyle="bold" android:layout_marginRight="3dp" style="@android:style/TextAppearance.Small" android:text="@string/trackmgr_waypoints_count"
Expand Down
2 changes: 1 addition & 1 deletion res/layout/trackmanager.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
<TextView android:layout_height="wrap_content" android:gravity="center_horizontal" android:layout_width="fill_parent" style="@android:style/TextAppearance.Large" android:text="@string/trackmgr_tracklist" android:paddingBottom="5dp"></TextView>
<FrameLayout android:layout_weight="1" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:id="@+id/trackmanager_list" android:padding="3dp">
android:layout_height="0dip" android:id="@+id/trackmanager_list" android:padding="3dp">

<ListView android:layout_width="fill_parent" android:layout_height="fill_parent"
android:id="@id/android:list"></ListView>
Expand Down
2 changes: 1 addition & 1 deletion res/menu/displaytrackmap_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
android:icon="@android:drawable/ic_menu_mylocation"
android:title="@string/menu_center_to_gps" />
<item android:id="@+id/displaytrackmap_menu_settings"
android:titleCondensed="@string/menu_settings" android:title="@string/menu_settings"
android:title="@string/menu_settings"
android:icon="@android:drawable/ic_menu_preferences"></item>
</menu>
8 changes: 4 additions & 4 deletions res/menu/trackdetail_menu.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/trackdetail_menu_save"
android:titleCondensed="@string/menu_save" android:icon="@android:drawable/ic_menu_save"
android:icon="@android:drawable/ic_menu_save"
android:title="@string/menu_save"></item>
<item android:titleCondensed="@string/menu_cancel"
<item android:title="@string/menu_cancel"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:id="@+id/trackdetail_menu_cancel" android:title="@string/menu_cancel"></item>
android:id="@+id/trackdetail_menu_cancel"></item>
<item android:id="@+id/trackdetail_menu_display"
android:icon="@android:drawable/ic_menu_compass" android:titleCondensed="@string/menu_displaytrack" android:title="@string/menu_displaytrack"></item>
<item android:id="@+id/trackdetail_menu_export" android:titleCondensed="@string/menu_export" android:title="@string/menu_export" android:icon="@android:drawable/ic_menu_upload"></item>
<item android:id="@+id/trackdetail_menu_export" android:title="@string/menu_export" android:icon="@android:drawable/ic_menu_upload"></item>
</menu>
10 changes: 5 additions & 5 deletions res/menu/tracklogger_menu.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/tracklogger_menu_stoptracking"
android:titleCondensed="@string/menu_stoptracking" android:title="@string/menu_stoptracking"
android:title="@string/menu_stoptracking"
android:icon="@android:drawable/ic_menu_save" ></item>
<item android:id="@+id/tracklogger_menu_waypointlist"
android:titleCondensed="@string/menu_waypointlist" android:title="@string/menu_waypointlist"
android:title="@string/menu_waypointlist"
android:icon="@android:drawable/ic_menu_directions"></item>
<item android:id="@+id/tracklogger_menu_displaytrack"
android:titleCondensed="@string/menu_displaytrack" android:title="@string/menu_displaytrack"
android:title="@string/menu_displaytrack"
android:icon="@android:drawable/ic_menu_compass"></item>
<item android:id="@+id/tracklogger_menu_settings"
android:titleCondensed="@string/menu_settings" android:title="@string/menu_settings"
android:title="@string/menu_settings"
android:icon="@android:drawable/ic_menu_preferences"></item>
<item android:id="@+id/tracklogger_menu_about"
android:titleCondensed="@string/menu_about" android:title="@string/menu_about"
android:title="@string/menu_about"
android:icon="@android:drawable/ic_menu_help"></item>
</menu>
10 changes: 5 additions & 5 deletions res/menu/trackmgr_menu.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/trackmgr_menu_newtrack"
android:titleCondensed="@string/menu_newtrack" android:title="@string/menu_newtrack"
android:title="@string/menu_newtrack"
android:icon="@android:drawable/ic_menu_add"></item>
<item android:id="@+id/trackmgr_menu_stopcurrenttrack"
android:titleCondensed="@string/menu_stopcurrenttrack" android:title="@string/menu_stopcurrenttrack"
android:title="@string/menu_stopcurrenttrack"
android:icon="@android:drawable/ic_menu_add"></item>
<item android:id="@+id/trackmgr_menu_deletetracks"
android:titleCondensed="@string/menu_deletetracks" android:title="@string/menu_deletetracks"
android:title="@string/menu_deletetracks"
android:icon="@android:drawable/ic_menu_delete"></item>
<item android:id="@+id/trackmgr_menu_settings"
android:titleCondensed="@string/menu_settings" android:title="@string/menu_settings"
android:title="@string/menu_settings"
android:icon="@android:drawable/ic_menu_preferences"></item>
<item android:id="@+id/trackmgr_menu_about"
android:titleCondensed="@string/menu_about" android:title="@string/menu_about"
android:title="@string/menu_about"
android:icon="@android:drawable/ic_menu_help"></item>
</menu>
2 changes: 1 addition & 1 deletion res/values/strings-preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<string name="prefs_storage_dir">External storage (SD) directory</string>
<string name="prefs_storage_dir_hint">Effective for the next track (not the current one)</string>
<string name="prefs_output_one_dir_per_track">One directory per track</string>
<string name="prefs_output_one_dir_per_track_summary">Save each track and associated files to it\'s own directory</string>
<string name="prefs_output_one_dir_per_track_summary">Save each track and associated files to its own directory</string>
<string name="prefs_output_filename">Filename for named tracks</string>
<string name="prefs_output_filename_summary">Pattern for filename if the track has a name</string>
<string-array name="prefs_output_filename_keys">
Expand Down
4 changes: 2 additions & 2 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<string name="tracklogger_gps_disabled_hint">GPS is disabled. Do you want to enable it?</string>

<!-- Waypoint List -->
<string name="wplist">Waypoint List</string>
<string name="wplist">Waypoint list</string>
<string name="wplist_latitude">Lat: </string>
<string name="wplist_longitude">Long: </string>
<string name="wplist_elevation">Ele: </string>
Expand Down Expand Up @@ -107,7 +107,7 @@
<!-- Various -->
<string name="various_unit_meters">m</string>
<string name="various_accuracy">Accuracy</string>
<string name="various_waiting_gps_fix">Waiting GPS fix&#8230;</string>
<string name="various_waiting_gps_fix">Waiting for GPS fix&#8230;</string>

<!-- OSM map view -->
<string name="displaytrackmap">OpenStreetMap track display</string>
Expand Down
Loading