pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Check the "Display Showcase" option on the current PreferenceScreen before deleting it

Browse source
This commit is contained in:
Roman Romanov 2017-07-17 09:12:03 +04:00 • committed by r.kuznetsov
parent 0ee99f0a5a
commit 1e82139ccf
1 changed files with 13 additions and 4 deletions

17
android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
View file

@ -295,10 +295,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
initPlayServicesPrefsCallbacks();
initAutoZoomPrefsCallbacks();
initSimplifiedTrafficColorsPrefsCallbacks();
if (!MytargetHelper.isShowcaseSwitchedOnServer())
getPreferenceScreen().removePreference(findPreference(getString(R.string.pref_showcase_switched_on)));
initDisplayShowcasePrefs();
initLoggingEnabledPrefsCallbacks();
initUseMobileDataPrefsCallbacks();
@ -351,6 +348,18 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
return super.onPreferenceTreeClick(preference);
}
private void initDisplayShowcasePrefs()
{
if (MytargetHelper.isShowcaseSwitchedOnServer())
return;
Preference pref = findPreference(getString(R.string.pref_showcase_switched_on));
if (pref == null)
return;
getPreferenceScreen().removePreference(pref);
}
private void initLangInfoLink()
{
if (mLangInfoLink != null)