disable combined mode because of lack of images and performance issues
This commit is contained in:
parent
0148a20369
commit
9479fac206
@ -88,11 +88,11 @@
|
||||
android:summary="@string/browse_cats_like_feeds_summary"
|
||||
android:title="@string/browse_cats_like_feeds" />
|
||||
|
||||
<CheckBoxPreference
|
||||
<!-- <CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="combined_mode"
|
||||
android:summary="@string/combined_mode_summary"
|
||||
android:title="@string/combined_mode" />
|
||||
android:title="@string/combined_mode" /> -->
|
||||
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
|
@ -315,7 +315,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
|
||||
m_activity = (OnlineActivity) activity;
|
||||
m_listener = (HeadlinesEventListener) activity;
|
||||
|
||||
m_combinedMode = m_prefs.getBoolean("combined_mode", false);
|
||||
m_combinedMode = false; /* m_prefs.getBoolean("combined_mode", false); */
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -433,6 +433,16 @@ public class OnlineActivity extends CommonActivity {
|
||||
if (hasPendingOfflineData())
|
||||
syncOfflineData();
|
||||
|
||||
List<PackageInfo> pkgs = getPackageManager()
|
||||
.getInstalledPackages(0);
|
||||
|
||||
for (PackageInfo p : pkgs) {
|
||||
if ("org.fox.ttrss.key".equals(p.packageName)) {
|
||||
toast(R.string.donate_thanks);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
finish();
|
||||
}
|
||||
|
||||
@ -879,11 +889,9 @@ public class OnlineActivity extends CommonActivity {
|
||||
if ("org.fox.ttrss.key".equals(p.packageName)) {
|
||||
Log.d(TAG, "license apk found");
|
||||
menu.findItem(R.id.donate).setVisible(false);
|
||||
toast(R.string.donate_thanks);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -20,12 +20,12 @@ public class PreferencesActivity extends PreferenceActivity {
|
||||
|
||||
findPreference("justify_article_text").setEnabled(!prefs.getBoolean("combined_mode", false));
|
||||
|
||||
findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
|
||||
/* findPreference("combined_mode").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
findPreference("justify_article_text").setEnabled(!newValue.toString().equals("true"));
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}); */
|
||||
}
|
||||
}
|
||||
|
@ -322,7 +322,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
|
||||
m_activity = (OfflineActivity) activity;
|
||||
|
||||
m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
|
||||
m_combinedMode = m_prefs.getBoolean("combined_mode", false);
|
||||
m_combinedMode = false; /* m_prefs.getBoolean("combined_mode", false); */
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Loading…
Reference in New Issue
Block a user