karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

A few more minor fixes.

Browse Source
This commit is contained in:
Sandor Dornbush
2010-12-01 20:37:11 -08:00
parent 6e567fa725
commit 060881777d
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/sensor_state.xml
-2
View File
@@ -67,8 +67,6 @@ limitations under the License.
<TableRow <TableRow
android:padding="1dip"> android:padding="1dip">
<TextView <TextView
android:id="@+id/power_label"
android:textSize="20dip"
android:layout_column="1" android:layout_column="1"
android:layout_span="3" android:layout_span="3"
android:text="@string/power" /> android:text="@string/power" />
MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+2 -5
View File
@@ -199,7 +199,6 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
int idxAccuracy = cursor.getColumnIndexOrThrow(TrackPointsColumns.ACCURACY); int idxAccuracy = cursor.getColumnIndexOrThrow(TrackPointsColumns.ACCURACY);
int idxSpeed = cursor.getColumnIndexOrThrow(TrackPointsColumns.SPEED); int idxSpeed = cursor.getColumnIndexOrThrow(TrackPointsColumns.SPEED);
int idxSensor = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR); int idxSensor = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR);
int idxId = cursor.getColumnIndexOrThrow(TrackPointsColumns._ID);
if (!cursor.isNull(idxLatitude)) { if (!cursor.isNull(idxLatitude)) {
location.setLatitude(1. * cursor.getInt(idxLatitude) / 1E6); location.setLatitude(1. * cursor.getInt(idxLatitude) / 1E6);
@@ -475,8 +474,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
contentResolver.delete(TracksColumns.CONTENT_URI, null, null); contentResolver.delete(TracksColumns.CONTENT_URI, null, null);
contentResolver.delete(TrackPointsColumns.CONTENT_URI, contentResolver.delete(TrackPointsColumns.CONTENT_URI,
null, null); null, null);
contentResolver.delete( contentResolver.delete(WaypointsColumns.CONTENT_URI, null, null);
WaypointsColumns.CONTENT_URI, null, null);
} }
@Override @Override
@@ -886,9 +884,8 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
@Override @Override
public Uri insertTrackPoint(Location location, long trackId) { public Uri insertTrackPoint(Location location, long trackId) {
Log.d(MyTracksProvider.TAG, "MyTracksProviderUtilsImpl.insertTrackPoint"); Log.d(MyTracksProvider.TAG, "MyTracksProviderUtilsImpl.insertTrackPoint");
Uri u = contentResolver.insert(TrackPointsColumns.CONTENT_URI, return contentResolver.insert(TrackPointsColumns.CONTENT_URI,
createContentValues(location, trackId)); createContentValues(location, trackId));
return u;
} }
@Override @Override
MyTracks/src/com/google/android/apps/mytracks/content/TrackPointsColumns.java
+1 -1
View File
@@ -33,7 +33,7 @@ public interface TrackPointsColumns extends BaseColumns {
"vnd.android.cursor.dir/vnd.google.trackpoint"; "vnd.android.cursor.dir/vnd.google.trackpoint";
public static final String CONTENT_ITEMTYPE = public static final String CONTENT_ITEMTYPE =
"vnd.android.cursor.item/vnd.google.trackpoint"; "vnd.android.cursor.item/vnd.google.trackpoint";
public static final String DEFAULT_SORT_ORDER = "trackpoints._id"; public static final String DEFAULT_SORT_ORDER = "_id";
/* All columns */ /* All columns */
public static final String TRACKID = "trackid"; public static final String TRACKID = "trackid";