forked from upstream-mirrors/OpenTracks
Removed trackball support.
This commit is contained in:
@@ -414,7 +414,6 @@ public class TrackDetailActivity extends AbstractTrackActivity
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void takePicture() {
|
private void takePicture() {
|
||||||
Intent intent;
|
|
||||||
File dir = FileUtils.getPhotoDir(trackId);
|
File dir = FileUtils.getPhotoDir(trackId);
|
||||||
FileUtils.ensureDirectoryExists(dir);
|
FileUtils.ensureDirectoryExists(dir);
|
||||||
|
|
||||||
@@ -424,7 +423,7 @@ public class TrackDetailActivity extends AbstractTrackActivity
|
|||||||
if (file != null) {
|
if (file != null) {
|
||||||
photoUri = FileProvider.getUriForFile(this, "com.google.android.apps.mytracks.fileprovider", file);
|
photoUri = FileProvider.getUriForFile(this, "com.google.android.apps.mytracks.fileprovider", file);
|
||||||
Log.d(TAG, "Taking photo to URI: " + photoUri);
|
Log.d(TAG, "Taking photo to URI: " + photoUri);
|
||||||
intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE)
|
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE)
|
||||||
.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
|
.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
|
||||||
startActivityForResult(intent, CAMERA_REQUEST_CODE);
|
startActivityForResult(intent, CAMERA_REQUEST_CODE);
|
||||||
}
|
}
|
||||||
@@ -443,18 +442,6 @@ public class TrackDetailActivity extends AbstractTrackActivity
|
|||||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onTrackballEvent(MotionEvent event) {
|
|
||||||
if (event.getAction() == MotionEvent.ACTION_DOWN) {
|
|
||||||
if (trackId == recordingTrackId && !recordingTrackPaused) {
|
|
||||||
TrackRecordingServiceConnectionUtils.addMarker(
|
|
||||||
this, trackRecordingServiceConnection, WaypointCreationRequest.DEFAULT_WAYPOINT);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return super.onTrackballEvent(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TrackRecordingServiceConnection getTrackRecordingServiceConnection() {
|
protected TrackRecordingServiceConnection getTrackRecordingServiceConnection() {
|
||||||
return trackRecordingServiceConnection;
|
return trackRecordingServiceConnection;
|
||||||
|
|||||||
Reference in New Issue
Block a user