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

hide "Include touchscreen apps" pref on devices with touchscreen

Browse Source 
closes fdroid/fdroidclient#1438
This commit is contained in:
Hans-Christoph Steiner 2018-07-31 11:49:29 +02:00
parent 3a501c9eac
commit 8f393d9f43
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/basic/res/xml/preferences.xml
View File

@ -76,7 +76,8 @@
android:entryValues="@array/themeValues"/> android:entryValues="@array/themeValues"/>
</android.support.v7.preference.PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
<android.support.v7.preference.PreferenceCategory android:title="@string/appcompatibility"> <android.support.v7.preference.PreferenceCategory android:title="@string/appcompatibility"
android:key="pref_category_appcompatibility">
<SwitchPreference <SwitchPreference
android:title="@string/show_incompat_versions" android:title="@string/show_incompat_versions"
android:defaultValue="false" android:defaultValue="false"

10
app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -28,6 +28,7 @@ package org.fdroid.fdroid.views.fragments;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v14.preference.PreferenceFragment; import android.support.v14.preference.PreferenceFragment;
@ -156,11 +157,18 @@ public class PreferencesFragment extends PreferenceFragment
languagePref.setEntries(languages.getAllNames()); languagePref.setEntries(languages.getAllNames());
languagePref.setEntryValues(languages.getSupportedLocales()); languagePref.setEntryValues(languages.getSupportedLocales());
} }
if (getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)) {
PreferenceCategory category = (PreferenceCategory) findPreference("pref_category_appcompatibility");
category.removePreference(findPreference(Preferences.PREF_FORCE_TOUCH_APPS));
}
} }
private void checkSummary(String key, int resId) { private void checkSummary(String key, int resId) {
Preference pref = findPreference(key); Preference pref = findPreference(key);
pref.setSummary(resId); if (pref != null) {
pref.setSummary(resId);
}
} }
private void entrySummary(String key) { private void entrySummary(String key) {

3
app/src/main/res/xml/preferences.xml
View File

@ -76,7 +76,8 @@
android:entryValues="@array/themeValues"/> android:entryValues="@array/themeValues"/>
</android.support.v7.preference.PreferenceCategory> </android.support.v7.preference.PreferenceCategory>
<android.support.v7.preference.PreferenceCategory android:title="@string/appcompatibility"> <android.support.v7.preference.PreferenceCategory android:title="@string/appcompatibility"
android:key="pref_category_appcompatibility">
<SwitchPreference <SwitchPreference
android:title="@string/show_incompat_versions" android:title="@string/show_incompat_versions"
android:defaultValue="false" android:defaultValue="false"