Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue 905, profile name in title of sub-preference pages

Browse source
This commit is contained in:
Pavol Zibrita 2012-04-19 00:06:27 +02:00
parent 28a856eb22
commit 1ac8e2d9cf
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/xml/settings_pref.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/profile_settings"> <PreferenceCategory android:title="@string/profile_settings" android:key="profile_dep_cat">
<ListPreference android:summary="@string/settings_preset_descr" android:title="@string/settings_preset" android:key="application_mode"></ListPreference> <ListPreference android:summary="@string/settings_preset_descr" android:title="@string/settings_preset" android:key="application_mode"></ListPreference>
<PreferenceScreen android:key="map_settings" android:title="@string/rendering_settings" android:summary="@string/rendering_settings_descr"> <PreferenceScreen android:key="map_settings" android:title="@string/rendering_settings" android:summary="@string/rendering_settings_descr">

4
OsmAnd/src/net/osmand/plus/activities/ApplicationMode.java
View file

@ -19,8 +19,8 @@ public enum ApplicationMode {
this.key = key; this.key = key;
} }
public static String toHumanString(ApplicationMode m, Context ctx) { public String toHumanString(Context ctx) {
return ctx.getResources().getString(m.key); return ctx.getResources().getString(key);
} }
} }

13
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -57,6 +57,8 @@ import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.util.AttributeSet;
import android.view.View;
import android.widget.Toast; import android.widget.Toast;
public class SettingsActivity extends PreferenceActivity implements OnPreferenceChangeListener, OnPreferenceClickListener { public class SettingsActivity extends PreferenceActivity implements OnPreferenceChangeListener, OnPreferenceClickListener {
@ -321,7 +323,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
entries = new String[ApplicationMode.values().length]; entries = new String[ApplicationMode.values().length];
for(int i=0; i<entries.length; i++){ for(int i=0; i<entries.length; i++){
entries[i] = ApplicationMode.toHumanString(ApplicationMode.values()[i], this); entries[i] = ApplicationMode.values()[i].toHumanString(this);
} }
registerListPreference(osmandSettings.APPLICATION_MODE, screen, entries, ApplicationMode.values()); registerListPreference(osmandSettings.APPLICATION_MODE, screen, entries, ApplicationMode.values());
@ -501,7 +503,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
updateApplicationDirTextAndSummary(); updateApplicationDirTextAndSummary();
applicationModePreference.setTitle(getString(R.string.settings_preset) + " [" + ApplicationMode.toHumanString(osmandSettings.APPLICATION_MODE.get(), this) + "]"); applicationModePreference.setTitle(getString(R.string.settings_preset) + " [" + osmandSettings.APPLICATION_MODE.get().toHumanString(this) + "]");
dayNightModePreference.setSummary(getString(R.string.daynight_descr) + " [" + osmandSettings.DAYNIGHT_MODE.get().toHumanString(this) + "]"); dayNightModePreference.setSummary(getString(R.string.daynight_descr) + " [" + osmandSettings.DAYNIGHT_MODE.get().toHumanString(this) + "]");
routerServicePreference.setSummary(getString(R.string.router_service_descr) + " [" + osmandSettings.ROUTER_SERVICE.get() + "]"); routerServicePreference.setSummary(getString(R.string.router_service_descr) + " [" + osmandSettings.ROUTER_SERVICE.get() + "]");
@ -797,6 +799,13 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
@Override @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
Preference preference) { Preference preference) {
//customize the sub-preference title according the selected profile
if (preference.getKey() != null && preference instanceof PreferenceScreen &&
((PreferenceCategory)findPreference("profile_dep_cat")).findPreference(preference.getKey()) != null) {
PreferenceScreen scr = (PreferenceScreen)preference;
scr.getDialog().setTitle(scr.getTitle() + " [" + osmandSettings.APPLICATION_MODE.get().toHumanString(this) + "]");
}
if (preference == applicationDir) { if (preference == applicationDir) {
return true; return true;
} }