Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Specify preferences dependencies declaratively

Browse Source
This commit is contained in:
Ciaran Gultnieks 2014-08-28 17:39:34 +01:00
parent 9cfa079e46
commit b4d8ee08dc
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/preferences.xml
View File

@ -80,9 +80,11 @@
android:key="expert" /> android:key="expert" />
<CheckBoxPreference android:title="@string/root_installer" <CheckBoxPreference android:title="@string/root_installer"
android:defaultValue="false" android:defaultValue="false"
android:key="rootInstaller" /> android:key="rootInstaller"
android:dependency="expert" />
<CheckBoxPreference android:title="@string/system_installer" <CheckBoxPreference android:title="@string/system_installer"
android:defaultValue="false" android:defaultValue="false"
android:key="systemInstaller" /> android:key="systemInstaller"
android:dependency="expert" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

10
src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
View File

@ -140,16 +140,6 @@ public class PreferenceFragment
} else if (key.equals(Preferences.PREF_EXPERT)) { } else if (key.equals(Preferences.PREF_EXPERT)) {
onoffSummary(key, R.string.expert_on, onoffSummary(key, R.string.expert_on,
R.string.expert_off); R.string.expert_off);
CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
Preference rinst = findPreference(Preferences.PREF_ROOT_INSTALLER);
Preference sinst = findPreference(Preferences.PREF_SYSTEM_INSTALLER);
if (pref.isChecked()) {
rinst.setEnabled(true);
sinst.setEnabled(true);
} else {
rinst.setEnabled(false);
sinst.setEnabled(false);
}
} else if (key.equals(Preferences.PREF_ROOT_INSTALLER)) { } else if (key.equals(Preferences.PREF_ROOT_INSTALLER)) {
onoffSummary(key, R.string.root_installer_on, onoffSummary(key, R.string.root_installer_on,