From 73af3931e83951c9b3c037a6989ef812ba945ee0 Mon Sep 17 00:00:00 2001 From: Chumva Date: Thu, 19 Sep 2019 12:50:22 +0300 Subject: [PATCH] Fix compilation --- .../GeneralProfileSettingsFragment.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java index 6177f9c53f..e78163f47f 100644 --- a/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java @@ -68,8 +68,8 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment { private void setupAppThemePref() { final ListPreferenceEx appTheme = (ListPreferenceEx) findPreference(settings.OSMAND_THEME.getId()); - appTheme.setEntries(new String[]{getString(R.string.dark_theme), getString(R.string.light_theme)}); - appTheme.setEntryValues(new Integer[]{OsmandSettings.OSMAND_DARK_THEME, OsmandSettings.OSMAND_LIGHT_THEME}); + appTheme.setEntries(new String[] {getString(R.string.dark_theme), getString(R.string.light_theme)}); + appTheme.setEntryValues(new Integer[] {OsmandSettings.OSMAND_DARK_THEME, OsmandSettings.OSMAND_LIGHT_THEME}); appTheme.setIcon(getOsmandThemeIcon()); } @@ -79,8 +79,8 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment { private void setupRotateMapPref() { final ListPreferenceEx rotateMap = (ListPreferenceEx) findPreference(settings.ROTATE_MAP.getId()); - rotateMap.setEntries(new String[]{getString(R.string.rotate_map_none_opt), getString(R.string.rotate_map_bearing_opt), getString(R.string.rotate_map_compass_opt)}); - rotateMap.setEntryValues(new Integer[]{OsmandSettings.ROTATE_MAP_NONE, OsmandSettings.ROTATE_MAP_BEARING, OsmandSettings.ROTATE_MAP_COMPASS}); + rotateMap.setEntries(new String[] {getString(R.string.rotate_map_none_opt), getString(R.string.rotate_map_bearing_opt), getString(R.string.rotate_map_compass_opt)}); + rotateMap.setEntryValues(new Integer[] {OsmandSettings.ROTATE_MAP_NONE, OsmandSettings.ROTATE_MAP_BEARING, OsmandSettings.ROTATE_MAP_COMPASS}); rotateMap.setIcon(getRotateMapIcon()); } @@ -97,8 +97,8 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment { private void setupMapScreenOrientationPref() { final ListPreferenceEx mapScreenOrientation = (ListPreferenceEx) findPreference(settings.MAP_SCREEN_ORIENTATION.getId()); - mapScreenOrientation.setEntries(new String[]{getString(R.string.map_orientation_portrait), getString(R.string.map_orientation_landscape), getString(R.string.map_orientation_default)}); - mapScreenOrientation.setEntryValues(new Integer[]{ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED}); + mapScreenOrientation.setEntries(new String[] {getString(R.string.map_orientation_portrait), getString(R.string.map_orientation_landscape), getString(R.string.map_orientation_default)}); + mapScreenOrientation.setEntryValues(new Integer[] {ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED}); mapScreenOrientation.setIcon(getMapScreenOrientationIcon()); } @@ -185,14 +185,14 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment { private void setupExternalInputDevicePref() { ListPreferenceEx externalInputDevice = (ListPreferenceEx) findPreference(settings.EXTERNAL_INPUT_DEVICE.getId()); - externalInputDevice.setEntries(new String[]{ + externalInputDevice.setEntries(new String[] { getString(R.string.sett_no_ext_input), getString(R.string.sett_generic_ext_input), getString(R.string.sett_wunderlinq_ext_input), getString(R.string.sett_parrot_ext_input) }); - externalInputDevice.setEntryValues(new Integer[]{ + externalInputDevice.setEntryValues(new Integer[] { OsmandSettings.NO_EXTERNAL_DEVICE, OsmandSettings.GENERIC_EXTERNAL_DEVICE, OsmandSettings.WUNDERLINQ_EXTERNAL_DEVICE, @@ -281,7 +281,7 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment { public boolean onPreferenceChange(Preference preference, Object newValue) { FragmentManager fragmentManager = getFragmentManager(); if (fragmentManager != null) { - ChangeGeneralProfilesPrefBottomSheet.showInstance(fragmentManager, preference.getKey(), newValue, this); + ChangeGeneralProfilesPrefBottomSheet.showInstance(fragmentManager, preference.getKey(), newValue, this, false); } return false; }