forked from upstream-mirrors/OpenTracks
TrackDetailActivity: disable activity type changer in view mode.
Fix #3.
This commit is contained in:
@@ -94,8 +94,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
|
|||||||
// Preferences
|
// Preferences
|
||||||
private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
|
private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
|
||||||
private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
|
private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
|
||||||
@Deprecated //TODO Not required to be member variable.
|
|
||||||
private boolean showOnLockScreen = getResources().getBoolean(R.bool.stats_show_on_lockscreen_while_recording_default);
|
|
||||||
|
|
||||||
private final Runnable bindChangedCallback = new Runnable() {
|
private final Runnable bindChangedCallback = new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
@@ -135,7 +133,6 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.stats_show_on_lockscreen_while_recording_key, key)) {
|
if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.stats_show_on_lockscreen_while_recording_key, key)) {
|
||||||
showOnLockScreen = PreferencesUtils.shouldShowStatsOnLockscreen(TrackDetailActivity.this);
|
|
||||||
setLockscreenPolicy();
|
setLockscreenPolicy();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,12 +225,14 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void setLockscreenPolicy() {
|
private void setLockscreenPolicy() {
|
||||||
|
boolean showOnLockScreen = PreferencesUtils.shouldShowStatsOnLockscreen(TrackDetailActivity.this);
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
|
||||||
setShowWhenLocked(showOnLockScreen);
|
setShowWhenLocked(showOnLockScreen);
|
||||||
|
} else if (showOnLockScreen) {
|
||||||
|
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
|
||||||
} else {
|
} else {
|
||||||
if (showOnLockScreen)
|
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
|
||||||
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
|
|
||||||
else getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,6 @@ public class StatsFragment extends Fragment implements TrackDataListener {
|
|||||||
|
|
||||||
private Location lastLocation = null;
|
private Location lastLocation = null;
|
||||||
private TripStatistics lastTripStatistics = null;
|
private TripStatistics lastTripStatistics = null;
|
||||||
private SensorDataSet sensorDataSet = null;
|
|
||||||
|
|
||||||
private final Runnable updateUIeachSecond = new Runnable() {
|
private final Runnable updateUIeachSecond = new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
@@ -304,9 +303,10 @@ public class StatsFragment extends Fragment implements TrackDataListener {
|
|||||||
*/
|
*/
|
||||||
private void updateSensorDataUI() {
|
private void updateSensorDataUI() {
|
||||||
ITrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
|
ITrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
|
||||||
|
|
||||||
|
SensorDataSet sensorDataSet = null;
|
||||||
if (trackRecordingService == null) {
|
if (trackRecordingService == null) {
|
||||||
Log.d(STATS_FRAGMENT_TAG, "Cannot get the track recording service.");
|
Log.d(STATS_FRAGMENT_TAG, "Cannot get the track recording service.");
|
||||||
sensorDataSet = null;
|
|
||||||
} else {
|
} else {
|
||||||
//TODO sensorState = trackRecordingService.getSensorState();
|
//TODO sensorState = trackRecordingService.getSensorState();
|
||||||
sensorDataSet = trackRecordingService.getSensorData();
|
sensorDataSet = trackRecordingService.getSensorData();
|
||||||
|
|||||||
@@ -151,6 +151,8 @@ public class StatsUtils {
|
|||||||
public static void setTripStatisticsValues(Activity activity, TripStatistics tripStatistics, String trackIconValue) {
|
public static void setTripStatisticsValues(Activity activity, TripStatistics tripStatistics, String trackIconValue) {
|
||||||
boolean metricUnits = PreferencesUtils.isMetricUnits(activity);
|
boolean metricUnits = PreferencesUtils.isMetricUnits(activity);
|
||||||
boolean reportSpeed = PreferencesUtils.isReportSpeed(activity);
|
boolean reportSpeed = PreferencesUtils.isReportSpeed(activity);
|
||||||
|
boolean isRecording = PreferencesUtils.isRecording(activity);
|
||||||
|
;
|
||||||
|
|
||||||
// Set total distance
|
// Set total distance
|
||||||
{
|
{
|
||||||
@@ -173,6 +175,7 @@ public class StatsUtils {
|
|||||||
if (trackIconValue != null) {
|
if (trackIconValue != null) {
|
||||||
TrackIconUtils.setIconSpinner(spinner, trackIconValue);
|
TrackIconUtils.setIconSpinner(spinner, trackIconValue);
|
||||||
}
|
}
|
||||||
|
spinner.setEnabled(isRecording);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set time
|
// Set time
|
||||||
|
|||||||
Reference in New Issue
Block a user