phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development'

Browse Source 
Conflicts:
	mobile/res/xml/preferences.xml
	mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java
This commit is contained in:
Philipp Schaefer
2013-10-22 20:45:06 +02:00
parent 22ba06512e 3d7192ecd6
commit 796f693370
20 changed files with 366 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java
View File

@ -63,8 +63,9 @@ public class MainSettings extends PreferenceFragment {
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (preference.getTitle().toString().equals(getString(R.string.pref_advanced_options))
|| preference.getTitle().toString().equals(getString(R.string.pref_about_title)))
|| preference.getTitle().toString().equals(getString(R.string.pref_about_title))) {
initializeActionBar((PreferenceScreen) preference);
}
return super.onPreferenceTreeClick(preferenceScreen, preference);
}