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

Settings: remove default setting for default activity.

Browse Source
This commit is contained in:
Dennis Guse
2019-11-12 18:43:32 +01:00
parent b34805272f
commit 081db5a58b
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
+7 -8
View File
@@ -43,14 +43,6 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
*/
public class ActivityTypePreference extends DialogPreference {
private SummaryProvider<DialogPreference> summaryProvider = new SummaryProvider<DialogPreference>() {
@Override
public CharSequence provideSummary(DialogPreference preference) {
String defaultActivity = PreferencesUtils.getDefaultActivity(ActivityTypePreference.this.getContext());
return defaultActivity != null && !defaultActivity.equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT) ? defaultActivity : getContext().getString(R.string.value_unknown);
}
};
public ActivityTypePreference(Context context, AttributeSet attrs) {
super(context, attrs);
setDialogLayoutResource(R.layout.preference_activity_type);
@@ -58,6 +50,13 @@ public class ActivityTypePreference extends DialogPreference {
setNegativeButtonText(android.R.string.cancel);
setDialogIcon(null);
setPersistent(true);
SummaryProvider<DialogPreference> summaryProvider = new SummaryProvider<DialogPreference>() {
@Override
public CharSequence provideSummary(DialogPreference preference) {
return PreferencesUtils.getDefaultActivity(ActivityTypePreference.this.getContext());
}
};
setSummaryProvider(summaryProvider);
}
src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
+1 -4
View File
@@ -99,11 +99,8 @@ public class PreferencesUtils {
PreferencesUtils.setInt(context, R.string.auto_resume_track_current_retry_key, getAutoResumeTrackCurrentRetryDefault(context) + 1);
}
public static final String DEFAULT_ACTIVITY_DEFAULT = "";
public static String getDefaultActivity(Context context) {
return PreferencesUtils.getString(context, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
return PreferencesUtils.getString(context, R.string.default_activity_key, context.getString(R.string.default_activity_default));
}
public static void setDefaultActivity(Context context, String newDefaultActivity) {