Merge branch 'network-pref-revamp' into 'master'

Network pref revamp Closes #1381 See merge request fdroid/fdroidclient!677
2018-04-25 20:46:55 +00:00 · 2018-04-25 20:46:55 +00:00 · 2cab890e34
commit 2cab890e34
parent 4ff4f8056f 94e5519d23
77 changed files with 524 additions and 472 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -23,7 +23,7 @@ dependencies {
    implementation 'com.android.support:support-vector-drawable:27.1.1'
    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
    implementation 'com.android.support:palette-v7:27.1.1'
-    implementation 'com.android.support:preference-v7:27.1.1'
+    implementation 'com.android.support:preference-v14:27.1.1'

    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
    implementation 'com.google.zxing:core:3.3.2'
--- a/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
+++ b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java
@ -5,8 +5,8 @@ import android.content.SharedPreferences;
 import android.content.pm.FeatureInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
+import android.support.v7.preference.PreferenceManager;
 import org.fdroid.fdroid.compat.SupportedArchitectures;
 import org.fdroid.fdroid.data.Apk;

--- a/app/src/main/java/org/fdroid/fdroid/Preferences.java
+++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java
@ -1,9 +1,11 @@
 package org.fdroid.fdroid;

+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
+import android.text.format.DateUtils;
 import android.util.Log;
 import info.guardianproject.netcipher.NetCipher;
 import org.fdroid.fdroid.net.ConnectivityMonitorService;
@ -41,10 +43,11 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
        }
    }

-    public static final String PREF_UPD_INTERVAL = "updateInterval";
-    public static final String PREF_UPD_WIFI_ONLY = "updateOnWifiOnly";
+    public static final String PREF_OVER_WIFI = "overWifi";
+    public static final String PREF_OVER_DATA = "overData";
+    public static final String PREF_UPDATE_INTERVAL = "updateIntervalSeekBarPosition";
    public static final String PREF_AUTO_DOWNLOAD_INSTALL_UPDATES = "updateAutoDownload";
-    public static final String PREF_UPD_NOTIFY = "updateNotify";
+    public static final String PREF_UPDATE_NOTIFICATION_ENABLED = "updateNotify";
    public static final String PREF_THEME = "theme";
    public static final String PREF_SHOW_INCOMPAT_VERSIONS = "incompatibleVersions";
    public static final String PREF_SHOW_ROOT_APPS = "rooted";
@ -72,10 +75,16 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
    public static final String PREF_PANIC_HIDE = "pref_panic_hide";
    public static final String PREF_HIDE_ON_LONG_PRESS_SEARCH = "hideOnLongPressSearch";

+    public static final int OVER_NETWORK_NEVER = 0;
+    public static final int OVER_NETWORK_ON_DEMAND = 1;
+    public static final int OVER_NETWORK_ALWAYS = 2;
+
    private static final boolean DEFAULT_SHOW_INCOMPAT_VERSIONS = false;
    private static final boolean DEFAULT_SHOW_ROOT_APPS = true;
    private static final boolean DEFAULT_SHOW_ANTI_FEATURE_APPS = true;
-    private static final int DEFAULT_UPD_INTERVAL = 24;
+    public static final int DEFAULT_OVER_WIFI = OVER_NETWORK_ALWAYS;
+    public static final int DEFAULT_OVER_DATA = OVER_NETWORK_ON_DEMAND;
+    public static final int DEFAULT_UPDATE_INTERVAL = 3;
    private static final boolean DEFAULT_PRIVILEGED_INSTALLER = true;
    //private static final boolean DEFAULT_LOCAL_REPO_BONJOUR = true;
    private static final long DEFAULT_KEEP_CACHE_TIME = TimeUnit.DAYS.toMillis(1);
@ -95,6 +104,11 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
    private static final boolean DEFAULT_PANIC_EXIT = true;
    private static final boolean DEFAULT_HIDE_ON_LONG_PRESS_SEARCH = false;

+    @Deprecated
+    private static final String OLD_PREF_UPDATE_INTERVAL = "updateInterval";
+    @Deprecated
+    private static final String OLD_PREF_UPDATE_ON_WIFI_ONLY = "updateOnWifiOnly";
+
    public enum Theme {
        light,
        dark,
@ -102,6 +116,16 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
        lightWithDarkActionBar, // Obsolete
    }

+    public static final long[] UPDATE_INTERVAL_VALUES = {
+            Long.MAX_VALUE,  // never
+            DateUtils.WEEK_IN_MILLIS * 2,
+            DateUtils.WEEK_IN_MILLIS,
+            DateUtils.DAY_IN_MILLIS,
+            DateUtils.HOUR_IN_MILLIS * 12,
+            DateUtils.HOUR_IN_MILLIS * 4,
+            DateUtils.HOUR_IN_MILLIS,
+    };
+
    private boolean showAppsRequiringRoot = DEFAULT_SHOW_ROOT_APPS;
    private boolean showAppsWithAntiFeatures = DEFAULT_SHOW_ANTI_FEATURE_APPS;

@ -161,16 +185,80 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
    /**
     * Get the update interval in milliseconds.
     */
-    public int getUpdateInterval() {
-        int hours;
-        try {
-            String value = preferences.getString(PREF_UPD_INTERVAL,
-                    String.valueOf(DEFAULT_UPD_INTERVAL));
-            hours = Integer.parseInt(value);
-        } catch (NumberFormatException e) {
-            hours = DEFAULT_UPD_INTERVAL;
+    public long getUpdateInterval() {
+        if (getOverData() == OVER_NETWORK_NEVER && getOverWifi() == OVER_NETWORK_NEVER) {
+            return UPDATE_INTERVAL_VALUES[0];
+        } else {
+            int position = preferences.getInt(PREF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL);
+            return UPDATE_INTERVAL_VALUES[position];
        }
-        return hours * 60 * 60 * 1000;
+    }
+
+    /**
+     * Migrate old preferences to new preferences.  These need to be processed
+     * and committed before {@code preferences.xml} is loaded.
+     */
+    @SuppressLint("ApplySharedPref")
+    public void migrateOldPreferences() {
+        SharedPreferences.Editor editor = preferences.edit();
+        if (migrateUpdateIntervalStringToInt(editor) || migrateOnlyOnWifi(editor)) {
+            editor.commit();
+        }
+    }
+
+    /**
+     * The original preference was a {@link String}, now it must be a {@link Integer}
+     * since {@link android.support.v7.preference.SeekBarPreference} uses it
+     * directly.
+     */
+    private boolean migrateUpdateIntervalStringToInt(SharedPreferences.Editor editor) {
+        if (!preferences.contains(OLD_PREF_UPDATE_INTERVAL)) {
+            return false; // already completed
+        }
+        int updateInterval = DEFAULT_UPDATE_INTERVAL;
+        String value = preferences.getString(OLD_PREF_UPDATE_INTERVAL, String.valueOf(24));
+        if ("1".equals(value)) { // 1 hour
+            updateInterval = 6;
+        } else if ("4".equals(value)) { // 4 hours
+            updateInterval = 5;
+        } else if ("12".equals(value)) { // 12 hours
+            updateInterval = 4;
+        } else if ("24".equals(value)) { // 1 day
+            updateInterval = 3;
+        } else if ("168".equals(value)) { // 2 weeks
+            updateInterval = 2;
+        } else if ("336".equals(value)) { // 1 week
+            updateInterval = 1;
+        } else if ("0".equals(value)) { // never
+            updateInterval = 0;
+        }
+        editor
+                .putInt(PREF_UPDATE_INTERVAL, updateInterval)
+                .remove(OLD_PREF_UPDATE_INTERVAL);
+        return true;
+    }
+
+    /**
+     * The original preference was just a "Only on Wifi" checkbox.
+     */
+    private boolean migrateOnlyOnWifi(SharedPreferences.Editor editor) {
+        if (!preferences.contains(OLD_PREF_UPDATE_ON_WIFI_ONLY)) {
+            return false; // already completed
+        }
+        int wifi;
+        int data;
+        if (preferences.getBoolean(OLD_PREF_UPDATE_ON_WIFI_ONLY, true)) {
+            wifi = OVER_NETWORK_ALWAYS;
+            data = OVER_NETWORK_NEVER;
+        } else {
+            wifi = OVER_NETWORK_ALWAYS;
+            data = OVER_NETWORK_ON_DEMAND;
+        }
+        editor
+                .putInt(PREF_OVER_WIFI, wifi)
+                .putInt(PREF_OVER_DATA, data)
+                .remove(OLD_PREF_UPDATE_ON_WIFI_ONLY);
+        return true;
    }

    /**
@ -283,7 +371,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
    }

    public boolean isUpdateNotificationEnabled() {
-        return preferences.getBoolean(PREF_UPD_NOTIFY, true);
+        return preferences.getBoolean(PREF_UPDATE_NOTIFICATION_ENABLED, true);
    }

    public boolean isAutoDownloadEnabled() {
@ -295,9 +383,29 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
     * downloaded in the background.
     */
    public boolean isBackgroundDownloadAllowed() {
-        return FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT ||
-                (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED
-                        && !preferences.getBoolean(PREF_UPD_WIFI_ONLY, false));
+        if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT) {
+            return getOverWifi() == OVER_NETWORK_ALWAYS;
+        } else if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED) {
+            return getOverData() == OVER_NETWORK_ALWAYS;
+        }
+        return false;
+    }
+
+    public boolean isOnDemandDownloadAllowed() {
+        if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_NO_LIMIT) {
+            return getOverWifi() != OVER_NETWORK_NEVER;
+        } else if (FDroidApp.networkState == ConnectivityMonitorService.FLAG_NET_METERED) {
+            return getOverData() != OVER_NETWORK_NEVER;
+        }
+        return false;
+    }
+
+    public int getOverWifi() {
+        return preferences.getInt(PREF_OVER_WIFI, DEFAULT_OVER_WIFI);
+    }
+
+    public int getOverData() {
+        return preferences.getInt(PREF_OVER_DATA, DEFAULT_OVER_DATA);
    }

    /**
--- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java
+++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java
@ -36,9 +36,9 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.os.SystemClock;
-import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@ -130,7 +130,8 @@ public class UpdateService extends IntentService {
     * @see <a href="https://developer.android.com/about/versions/android-5.0.html#Power">Project Volta: Scheduling jobs</a>
     */
    public static void schedule(Context context) {
-        int interval = Preferences.get().getUpdateInterval();
+        Preferences prefs = Preferences.get();
+        long interval = prefs.getUpdateInterval();

        if (Build.VERSION.SDK_INT < 21) {
            Intent intent = new Intent(context, UpdateService.class);
@ -148,13 +149,25 @@ public class UpdateService extends IntentService {
        } else {
            Utils.debugLog(TAG, "Using android-21 JobScheduler for updates");
            JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
-            jobScheduler.cancelAll();
            ComponentName componentName = new ComponentName(context, UpdateJobService.class);
-            JobInfo task = new JobInfo.Builder(0xfedcba, componentName)
-                    .setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED)
-                    .setOverrideDeadline(interval)
-                    .build();
-            jobScheduler.schedule(task);
+            JobInfo.Builder builder = new JobInfo.Builder(0xfedcba, componentName)
+                    .setRequiresDeviceIdle(true)
+                    .setPeriodic(interval);
+            if (Build.VERSION.SDK_INT >= 26) {
+                builder.setRequiresBatteryNotLow(true)
+                        .setRequiresStorageNotLow(true);
+            }
+            int wifi = prefs.getOverWifi();
+            if (prefs.getOverData() == Preferences.OVER_NETWORK_ALWAYS) {
+                if (Build.VERSION.SDK_INT < 26 || wifi == Preferences.OVER_NETWORK_ALWAYS) {
+                    builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
+                } else {
+                    builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_METERED);
+                }
+            } else if (wifi == Preferences.OVER_NETWORK_ALWAYS) {
+                builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED);
+            }
+            jobScheduler.schedule(builder.build());
        }
    }

--- a/app/src/main/java/org/fdroid/fdroid/Utils.java
+++ b/app/src/main/java/org/fdroid/fdroid/Utils.java
@ -21,6 +21,7 @@ package org.fdroid.fdroid;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.Signature;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@ -377,6 +378,26 @@ public final class Utils {
        return ret;
    }

+    /**
+     * Get the fingerprint used to represent an APK signing key in F-Droid.
+     * This is a custom fingerprint algorithm that was kind of accidentally
+     * created, but is still in use.
+     */
+    public static String getPackageSig(PackageInfo info) {
+        if (info == null || info.signatures == null || info.signatures.length < 1) {
+            return "";
+        }
+        Signature sig = info.signatures[0];
+        String sigHash = "";
+        try {
+            Hasher hash = new Hasher("MD5", sig.toCharsString().getBytes());
+            sigHash = hash.getHash();
+        } catch (NoSuchAlgorithmException e) {
+            // ignore
+        }
+        return sigHash;
+    }
+
    /**
     * There is a method {@link java.util.Locale#forLanguageTag(String)} which would be useful
     * for this, however it doesn't deal with android-specific language tags, which are a little
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@ -712,10 +712,10 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
     */
    private void initApkFromApkFile(Context context, Apk apk, PackageInfo packageInfo, SanitizedFile apkFile)
            throws IOException, CertificateEncodingException {
-        // TODO include signature hash calculation here
        if (apkFile.canRead()) {
            apk.hashType = "sha256";
            apk.hash = Utils.getBinaryHash(apkFile, apk.hashType);
+            apk.sig = Utils.getPackageSig(packageInfo);
        }
        initInstalledApk(context, apk, packageInfo, apkFile);
    }
--- a/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProviderService.java
@ -6,14 +6,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.Signature;
 import android.net.Uri;
 import android.os.Process;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import org.acra.ACRA;
 import org.fdroid.fdroid.AppUpdateStatusManager;
-import org.fdroid.fdroid.Hasher;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.InstalledAppTable;
 import rx.functions.Action1;
@ -22,7 +20,6 @@ import rx.subjects.PublishSubject;

 import java.io.File;
 import java.io.FilenameFilter;
-import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@ -310,7 +307,7 @@ public class InstalledAppProviderService extends IntentService {
        contentValues.put(InstalledAppTable.Cols.VERSION_NAME, packageInfo.versionName);
        contentValues.put(InstalledAppTable.Cols.APPLICATION_LABEL,
                InstalledAppProvider.getApplicationLabel(context, packageInfo.packageName));
-        contentValues.put(InstalledAppTable.Cols.SIGNATURE, getPackageSig(packageInfo));
+        contentValues.put(InstalledAppTable.Cols.SIGNATURE, Utils.getPackageSig(packageInfo));
        contentValues.put(InstalledAppTable.Cols.LAST_UPDATE_TIME, packageInfo.lastUpdateTime);

        contentValues.put(InstalledAppTable.Cols.HASH_TYPE, hashType);
@ -324,25 +321,4 @@ public class InstalledAppProviderService extends IntentService {
        Uri uri = InstalledAppProvider.getAppUri(packageName);
        context.getContentResolver().delete(uri, null, null);
    }
-
-    /**
-     * Get the fingerprint used to represent an APK signing key in F-Droid.
-     * This is a custom fingerprint algorithm that was kind of accidentally
-     * created, but is still in use.
-     */
-    private static String getPackageSig(PackageInfo info) {
-        if (info == null || info.signatures == null || info.signatures.length < 1) {
-            return "";
-        }
-        Signature sig = info.signatures[0];
-        String sigHash = "";
-        try {
-            Hasher hash = new Hasher("MD5", sig.toCharsString().getBytes());
-            sigHash = hash.getHash();
-        } catch (NoSuchAlgorithmException e) {
-            // ignore
-        }
-        return sigHash;
-    }
-
 }
--- a/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/ScreenShotsActivity.java
@ -71,7 +71,7 @@ public class ScreenShotsActivity extends AppCompatActivity {
    @Override
    protected void onResume() {
        super.onResume();
-        IMAGE_LOADER.denyNetworkDownloads(false);
+        IMAGE_LOADER.denyNetworkDownloads(!Preferences.get().isOnDemandDownloadAllowed());
    }

    @Override
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
@ -24,6 +24,9 @@ import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.data.Schema;

+/**
+ * Provides scrollable listing of apps for search and category views.
+ */
 public class AppListActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks<Cursor>,
        CategoryTextWatcher.SearchTermsChangedListener {

--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@ -6,14 +6,15 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.CheckBoxPreference;
 import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.SeekBarPreference;
 import android.text.TextUtils;
 import android.view.WindowManager;
-
 import info.guardianproject.netcipher.NetCipher;
 import info.guardianproject.netcipher.proxy.OrbotHelper;
 import org.fdroid.fdroid.AppDetails2;
@ -29,11 +30,13 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller;

 public class PreferencesFragment extends PreferenceFragment
        implements SharedPreferences.OnSharedPreferenceChangeListener {
+    public static final String TAG = "PreferencesFragment";

    private static final String[] SUMMARIES_TO_UPDATE = {
-            Preferences.PREF_UPD_INTERVAL,
-            Preferences.PREF_UPD_WIFI_ONLY,
-            Preferences.PREF_UPD_NOTIFY,
+            Preferences.PREF_OVER_WIFI,
+            Preferences.PREF_OVER_DATA,
+            Preferences.PREF_UPDATE_INTERVAL,
+            Preferences.PREF_UPDATE_NOTIFICATION_ENABLED,
            Preferences.PREF_SHOW_ROOT_APPS,
            Preferences.PREF_SHOW_ANTI_FEATURE_APPS,
            Preferences.PREF_SHOW_INCOMPAT_VERSIONS,
@ -49,22 +52,48 @@ public class PreferencesFragment extends PreferenceFragment
            Preferences.PREF_PROXY_PORT,
    };

+    private static final int[] UPDATE_INTERVAL_NAMES = {
+            R.string.interval_never,
+            R.string.interval_2w,
+            R.string.interval_1w,
+            R.string.interval_1d,
+            R.string.interval_12h,
+            R.string.interval_4h,
+            R.string.interval_1h,
+    };
+
    private static final int REQUEST_INSTALL_ORBOT = 0x1234;
-    private CheckBoxPreference enableProxyCheckPref;
-    private CheckBoxPreference useTorCheckPref;
+
+    private SeekBarPreference overWifiSeekBar;
+    private SeekBarPreference overDataSeekBar;
+    private SeekBarPreference updateIntervalSeekBar;
+    private SwitchPreference enableProxyCheckPref;
+    private SwitchPreference useTorCheckPref;
    private Preference updateAutoDownloadPref;
    private Preference updatePrivilegedExtensionPref;
    private long currentKeepCacheTime;
-    private FDroidApp fdroidApp;
+    private int overWifiPrevious;
+    private int overDataPrevious;
+    private int updateIntervalPrevious;

    @Override
    public void onCreatePreferences(Bundle bundle, String s) {
+
+        Preferences.get().migrateOldPreferences();
+
        addPreferencesFromResource(R.xml.preferences);
-        useTorCheckPref = (CheckBoxPreference) findPreference(Preferences.PREF_USE_TOR);
-        enableProxyCheckPref = (CheckBoxPreference) findPreference(Preferences.PREF_ENABLE_PROXY);
+        useTorCheckPref = (SwitchPreference) findPreference(Preferences.PREF_USE_TOR);
+        enableProxyCheckPref = (SwitchPreference) findPreference(Preferences.PREF_ENABLE_PROXY);
        updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES);
        updatePrivilegedExtensionPref = findPreference(Preferences.PREF_UNINSTALL_PRIVILEGED_APP);

+        overWifiSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_OVER_WIFI);
+        overWifiPrevious = overWifiSeekBar.getValue();
+        overDataSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_OVER_DATA);
+        overDataPrevious = overDataSeekBar.getValue();
+        updateIntervalSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_UPDATE_INTERVAL);
+        updateIntervalPrevious = updateIntervalSeekBar.getValue();
+
        ListPreference languagePref = (ListPreference) findPreference(Preferences.PREF_LANGUAGE);
        if (Build.VERSION.SDK_INT >= 24) {
            PreferenceCategory category = (PreferenceCategory) findPreference("pref_category_display");
@ -78,7 +107,7 @@ public class PreferencesFragment extends PreferenceFragment
    }

    private void checkSummary(String key, int resId) {
-        CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
+        Preference pref = findPreference(key);
        pref.setSummary(resId);
    }

@ -94,28 +123,56 @@ public class PreferencesFragment extends PreferenceFragment
        pref.setSummary(getString(resId, pref.getText()));
    }

+    private void setNetworkSeekBarSummary(SeekBarPreference seekBarPreference) {
+        int position = seekBarPreference.getValue();
+        if (position == 0) {
+            seekBarPreference.setSummary(R.string.over_network_never_summary);
+        } else if (position == 1) {
+            seekBarPreference.setSummary(R.string.over_network_on_demand_summary);
+        } else if (position == 2) {
+            seekBarPreference.setSummary(R.string.over_network_always_summary);
+        } else {
+            throw new IllegalArgumentException("No such " + seekBarPreference.getTitle() + " position: " + position);
+        }
+    }
+
+    private void enableUpdateInverval() {
+        if (overWifiSeekBar.getValue() == Preferences.OVER_NETWORK_NEVER
+                && overDataSeekBar.getValue() == Preferences.OVER_NETWORK_NEVER) {
+            updateIntervalSeekBar.setEnabled(false);
+            updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[0]);
+        } else {
+            updateIntervalSeekBar.setEnabled(true);
+            updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[updateIntervalSeekBar.getValue()]);
+        }
+    }
+
    private void updateSummary(String key, boolean changing) {

        switch (key) {
-            case Preferences.PREF_UPD_INTERVAL:
-                ListPreference listPref = (ListPreference) findPreference(
-                        Preferences.PREF_UPD_INTERVAL);
-                int interval = Integer.parseInt(listPref.getValue());
-                Preference onlyOnWifi = findPreference(
-                        Preferences.PREF_UPD_WIFI_ONLY);
-                onlyOnWifi.setEnabled(interval > 0);
-                if (interval == 0) {
-                    listPref.setSummary(R.string.update_interval_zero);
-                } else {
-                    listPref.setSummary(listPref.getEntry());
-                }
+
+            case Preferences.PREF_UPDATE_INTERVAL:
+                updateIntervalSeekBar.setMax(Preferences.UPDATE_INTERVAL_VALUES.length - 1);
+                updateIntervalSeekBar.setDefaultValue(Preferences.DEFAULT_UPDATE_INTERVAL);
+                int seekBarPosition = updateIntervalSeekBar.getValue();
+                updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[seekBarPosition]);
                break;

-            case Preferences.PREF_UPD_WIFI_ONLY:
-                checkSummary(key, R.string.automatic_scan_wifi_on);
+            case Preferences.PREF_OVER_WIFI:
+                overWifiSeekBar.setMax(Preferences.OVER_NETWORK_ALWAYS);
+                overWifiSeekBar.setDefaultValue(Preferences.DEFAULT_OVER_WIFI);
+                setNetworkSeekBarSummary(overWifiSeekBar);
+                enableUpdateInverval();
                break;

-            case Preferences.PREF_UPD_NOTIFY:
+            case Preferences.PREF_OVER_DATA:
+                overDataSeekBar.setMax(Preferences.OVER_NETWORK_ALWAYS);
+                overDataSeekBar.setDefaultValue(Preferences.DEFAULT_OVER_DATA);
+                setNetworkSeekBarSummary(overDataSeekBar);
+                enableUpdateInverval();
+                break;
+
+            case Preferences.PREF_UPDATE_NOTIFICATION_ENABLED:
                checkSummary(key, R.string.notify_on);
                break;

@ -123,10 +180,10 @@ public class PreferencesFragment extends PreferenceFragment
                entrySummary(key);
                if (changing) {
                    Activity activity = getActivity();
-                    fdroidApp = (FDroidApp) activity.getApplication();
+                    FDroidApp fdroidApp = (FDroidApp) activity.getApplication();
                    fdroidApp.reloadTheme();
                    fdroidApp.applyTheme(activity);
-                    fdroidApp.forceChangeTheme(activity);
+                    FDroidApp.forceChangeTheme(activity);
                }
                break;

@ -190,7 +247,7 @@ public class PreferencesFragment extends PreferenceFragment
                break;

            case Preferences.PREF_ENABLE_PROXY:
-                CheckBoxPreference checkPref = (CheckBoxPreference) findPreference(key);
+                SwitchPreference checkPref = (SwitchPreference) findPreference(key);
                checkPref.setSummary(R.string.enable_proxy_summary);
                break;

@ -371,6 +428,13 @@ public class PreferencesFragment extends PreferenceFragment
        super.onPause();
        getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
        Preferences.get().configureProxy();
+
+        if (updateIntervalPrevious != updateIntervalSeekBar.getValue()) {
+            UpdateService.schedule(getActivity());
+        } else if (Build.VERSION.SDK_INT >= 21 &&
+                (overWifiPrevious != overWifiSeekBar.getValue() || overDataPrevious != overDataSeekBar.getValue())) {
+            UpdateService.schedule(getActivity());
+        }
    }

    @Override
@ -385,5 +449,4 @@ public class PreferencesFragment extends PreferenceFragment
            }
        }
    }
-
 }
--- a/app/src/main/res/layout/preference_seekbar.xml
+++ b/app/src/main/res/layout/preference_seekbar.xml
@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dip"
+                android:layout_marginStart="16dip"
+                android:layout_marginEnd="16dip">
+
+    <TextView android:id="@+android:id/title"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:textAppearance="?attr/textAppearanceListItem"
+              android:textColor="?android:attr/textColorPrimary"
+              android:ellipsize="marquee"
+              android:fadingEdge="horizontal"/>
+
+    <TextView android:id="@+android:id/summary"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_below="@android:id/title"
+              android:layout_alignLeft="@android:id/title"
+              android:layout_alignStart="@android:id/title"
+              android:textAppearance="?attr/textAppearanceListItemSmall"
+              android:textColor="?android:attr/textColorSecondary"
+              android:singleLine="true"
+              android:ellipsize="marquee"
+              android:fadingEdge="horizontal"/>
+
+    <!-- @+id/seekbar_value must be present in a SeekBarPreference, but we don't use it -->
+    <TextView
+            android:id="@+id/seekbar_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/seekbar"
+            android:layout_alignTop="@android:id/summary"
+            android:layout_alignRight="@android:id/summary"
+            android:layout_alignEnd="@android:id/summary"
+            android:visibility="gone"
+            android:textSize="0sp"/>
+
+    <SeekBar xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/seekbar"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:layout_below="@android:id/summary"
+             android:layout_alignStart="@android:id/summary"
+             android:layout_alignLeft="@android:id/summary"
+             android:thumb="@android:drawable/radiobutton_off_background"
+             android:padding="16dip"
+             android:theme="@style/Widget.AppCompat.SeekBar.Discrete"/>
+
+</RelativeLayout>
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@ -15,10 +15,6 @@
    <string name="other">Ander</string>

    <string name="update_interval">Automatiese opdaterings interval</string>
-    <string name="update_interval_zero">Geen automatiese prgram lys opdaterings</string>
-    <string name="automatic_scan_wifi">Slegs op Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Opdateer slegs automaties wanneer gekoppel aan ongemete netwerke soos Wi-Fi
-    </string>
    <string name="update_auto_download">Automatise opdaterings</string>
    <string name="update_auto_download_summary">Opdateerings word outomaties afgelaai en jy word in kennis gestel om dit self te installeer</string>
    <string name="update_auto_install">Installeer opdaterings automaties</string>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -67,11 +67,6 @@
    <string name="other">أخرى</string>

    <string name="update_interval">تحديث الفاصل الزمني التلقائي</string>
-    <string name="update_interval_zero">لا توجد تحديثات لقائمة التطبيق التلقائي</string>
-    <string name="automatic_scan_wifi">فقط على الشبكات اللاسلكية (Wi-Fi)</string>
-    <string name="automatic_scan_wifi_on">تحديث قوائم التطبيق تلقائيا فقط على الشبكات غير المحدودة بمقدار البيانات مثل
-        (Wi-Fi)
-    </string>
    <string name="update_auto_download">جلب التحديثات تلقائياً</string>
    <string name="update_auto_download_summary">التحديثات تُحمل تلقائياً و أنت تتلقي إشعار لتثبيتها</string>
    <string name="notify">إظهار التحديثات المتوفرة</string>
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">Anovamientos</string>
    <string name="other">Otru</string>
    <string name="update_interval">Intervalu automáticu d\'anovamientu</string>
-    <string name="update_interval_zero">Nun anovar automáticamente\'l llistáu d\'aplicaciones</string>
-    <string name="automatic_scan_wifi">Namái na Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Auto-anovar namái en redes non midíes como Wi-Fi</string>
    <string name="notify">Ver los anovamientos disponibles</string>
    <string name="notify_on">Amuesa un avisu cuando tán disponibles anovamientos</string>
    <string name="system_installer">Estensión con privilexos</string>
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@ -19,9 +19,6 @@
    <string name="other">Іншае</string>

    <string name="update_interval">Інтэрвал аўтаматычнага абнаўлення</string>
-    <string name="update_interval_zero">Не абнаўляць спіс праграм аўтаматычна</string>
-    <string name="automatic_scan_wifi">Толькі праз Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Аўтаматычна абнаўляць толькі праз нелімітаваныя сеткі, такія як Wi-Fi</string>
    <string name="update_auto_download">Аўтаматычна атрымліваць абнаўленні</string>
    <string name="update_auto_download_summary">Абнаўленні спампуюцца аўтаматычна і вам будзе прапанавана ўсталяваць іх</string>
    <string name="update_auto_install">Аўтаматычна ўсталёўваць абнаўленні</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -12,11 +12,6 @@
    <string name="updates">Обновления</string>
    <string name="other">Други</string>
    <string name="update_interval">Проверка за актуализации</string>
-    <string name="update_interval_zero">Без автоматично актуализиране на списъка с приложения</string>
-    <string name="automatic_scan_wifi">Само през Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Актуализирането на списъка с приложения ще става само през неограничени мрежи
-        като Wi-Fi
-    </string>
    <string name="notify">Покажи наличните актуализации</string>
    <string name="notify_on">Известява при наличие на актуализация</string>
    <string name="system_installer">Инсталиране чрез системни разрешения</string>
--- a/app/src/main/res/values-bo/strings.xml
+++ b/app/src/main/res/values-bo/strings.xml
@ -85,9 +85,6 @@
    <string name="other">གཞན།</string>

    <string name="update_interval">རང་འགུལ་ངང་ནས་གསར་བསྒྱུར་བར་མཚམས།</string>
-    <string name="update_interval_zero">རང་འགུལ་མ་ཡིན་པའི་མཉེས་ཆས་གསར་བསྒྱར་གྱི་ཐོ་གཞུང་།</string>
-    <string name="automatic_scan_wifi">ཝཡེ་ཕྷཡེ་ཁོ་ནའི་སྒང་ལ།</string>
-    <string name="automatic_scan_wifi_on">ཝཡེ་ཕཡེ་ལྟ་བུ་ཚད་འཇལ་མི་ཐུབ་པའི་རིགས་ལ་རང་འགུལ་གྱི་གསར་བསྒྱུར་ཁོ་ན་བྱེད་དགོས།</string>
    <string name="update_auto_download">རང་འགུལ་ངང་ནས་གསར་བསྒྱར་ལེན།</string>
    <string name="update_auto_download_summary">རང་འགུལ་གྱི་ངང་ནས་གསར་བསྒྱུར་དང་ཕབ་ལེན་བྱས་པ་དང་ཁྱེད་རང་ལ་བརྡ་ལན་འབྱོར་སྐབས་དེ་དག་འགྲིག་བཅུག་བྱེད།</string>
    <string name="update_auto_install">རང་འགུལ་གྱི་ཐོག་ནས་གསར་བསྒྱུར་རྣམས་འགྲིག་བཅུག་བྱེད།</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -8,9 +8,6 @@
    <string name="updates">Actualitzacions</string>
    <string name="other">Altres</string>
    <string name="update_interval">Període d\'actualització automàtica</string>
-    <string name="update_interval_zero">No actualitzis automàticament la llista d\'aplicacions</string>
-    <string name="automatic_scan_wifi">Només en Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Actualitza la llista d\'aplicacions en xarxes sense limitació de tràfic, com ara Wi-Fi</string>
    <string name="notify">Mostreu les actualitzacions disponibles</string>
    <string name="notify_on">Ensenya una notificació quan hi hagi actualitzacions disponibles</string>
    <string name="system_installer">Extensió Privilegiada</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -8,9 +8,6 @@
    <string name="updates">Aktualizace</string>
    <string name="other">Ostatní</string>
    <string name="update_interval">Interval automatických aktualizací</string>
-    <string name="automatic_scan_wifi">Pouze přes Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Automaticky aktualizovat jen na nezpoplatněných sítích, jako např. Wi-Fi
-    </string>
    <string name="notify">Zobrazit dostupné aktualizace</string>
    <string name="notify_on">Upozornit, pokud jsou dostupné aktualizace</string>
    <string name="system_installer">Privilegovaná rozšíření</string>
@ -282,7 +279,6 @@
    <string name="theme_light">Světlý</string>
    <string name="theme_dark">Tmavý</string>
    <string name="theme_night">Noc</string>
-    <string name="update_interval_zero">Bez automatických aktualizací seznamu aplikací</string>
    <string name="system_install_denied_permissions">Privilegovaná oprávnění nebyla tomuto rozšíření udělena! Nahlašte
        prosím jako chybu!
    </string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -14,9 +14,6 @@
    <string name="other">Andet</string>

    <string name="update_interval">Automatisk opdateringsinterval</string>
-    <string name="update_interval_zero">Ingen automatiske opdateringer til applikationslisten</string>
-    <string name="automatic_scan_wifi">Kun på Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Opdater kun automatisk på ubegrænsede netværk som WI-FI</string>
    <string name="notify">Vis tilgængelige opdateringer</string>
    <string name="notify_on">Vis en notifikation når opdateringer er tilgængelige</string>
    <string name="system_installer">Privilegeret Udvidelse</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -9,11 +9,6 @@
    <string name="updates">Aktualisierungen</string>
    <string name="other">Andere</string>
    <string name="update_interval">Automatisches Aktualisierungsintervall</string>
-    <string name="update_interval_zero">Anwendungsliste nicht automatisch aktualisieren</string>
-    <string name="automatic_scan_wifi">Nur über WLAN</string>
-    <string name="automatic_scan_wifi_on">Anwendungsliste nur über gebührenfreie Netze wie WLAN automatisch
-        aktualisieren
-    </string>
    <string name="notify">Aktualisierungsbenachrichtigung</string>
    <string name="notify_on">Benachrichtigen, wenn Aktualisierungen verfügbar sind</string>
    <string name="system_installer">Rechteerweiterung</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">Ενημερώσεις</string>
    <string name="other">Άλλα</string>
    <string name="update_interval">Συχνότητα ενημέρωσης</string>
-    <string name="update_interval_zero">Μη αυτόματη ενημέρωση της λίστας εφαρμογών</string>
-    <string name="automatic_scan_wifi">Μόνο σε Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Αυτόματη ενημέρωση μόνο σε δίκτυα Wi-Fi</string>
    <string name="notify">Εμφάνιση διαθέσιμων ενημερώσεων</string>
    <string name="notify_on">Εμφάνιση ειδοποίησης όταν υπάρχουν διαθέσιμες ενημερώσεις</string>
    <string name="app_details">Λεπτομέρειες Εφαρμογής</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@ -4,7 +4,6 @@
    <string name="delete">Forigi</string>
    <string name="updates">Ĝisdatigoj</string>
    <string name="other">Aliaj</string>
-    <string name="automatic_scan_wifi">Nur per vifio</string>
    <string name="notify">Montri disponeblajn ĝisdatigojn</string>
    <string name="notify_on">Sciigi kiam ĝisdatigoj estas disponeblaj</string>
    <string name="app_details">Aplikaĵaj detaloj</string>
@ -99,8 +98,6 @@
    <string name="enable_nfc_send">Aktivigi sendadon tra NFC…</string>
    <string name="cache_downloaded">Kaŝmemorigi apk-dosierojn</string>
    <string name="unstable_updates_summary">Proponi ĝisdatigojn al nestabilaj versioj</string>
-    <string name="update_interval_zero">Neniam aŭtomate ĝisdatigi listojn de aplikaĵoj</string>
-    <string name="automatic_scan_wifi_on">Ĝisdatigi listojn aŭtomate nur per netarifaj retoj kiel vifio</string>
    <string name="system_installer">Privilegia aldonaĵo</string>
    <string name="system_installer_on">Uzi privilegian F-Droid-aldonaĵon por instali, ĝisdatigi kaj forigi pakaĵojn
    </string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -9,10 +9,6 @@
    <string name="updates">Avisos</string>
    <string name="other">Otros</string>
    <string name="update_interval">Intervalo de actualización automática</string>
-    <string name="update_interval_zero">No actualizar la lista de aplicaciones automáticamente</string>
-    <string name="automatic_scan_wifi">Sólo con Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Actualizar automáticamente solo con Wi-Fi y otras redes de tarifa plana
-    </string>
    <string name="notify">Mostrar actualizaciones disponibles</string>
    <string name="notify_on">Muestra una notificación cuando hay actualizaciones</string>
    <string name="system_installer">Extensión con permisos de sistema</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -14,9 +14,6 @@
    <string name="other">Muu</string>

    <string name="update_interval">Automaatne värskendusintervall</string>
-    <string name="update_interval_zero">Ära värskenda rakenduste loendit automaatselt</string>
-    <string name="automatic_scan_wifi">Ainult Wi-Fi ühendusega</string>
-    <string name="automatic_scan_wifi_on">Värskenda rakenduste loendit automaatselt piiramatu andmemahuga võrkudes nagu Wi-Fi</string>
    <string name="update_auto_download">Värskenduste automaatne hankimine</string>
    <string name="update_auto_download_summary">Värskendused laaditakse automaatselt ja sind teavitatakse, et neid paigaldada</string>
    <string name="notify">Kuva saadaolevad värskendused</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -9,10 +9,6 @@
    <string name="enable_nfc_send">Gaitu NFC bidez bidaltzea…</string>
    <string name="cache_downloaded">Gorde aplikazioak cachean</string>
    <string name="updates">Eguneraketak</string>
-    <string name="automatic_scan_wifi">Wi-Fi bidez soilik</string>
-    <string name="automatic_scan_wifi_on">Eguneratu aplikazioen zerrendak automatikoki Wi-Fi bezalako mugatu gabeko
-        sareen bidez soilik
-    </string>
    <string name="notify">Erakutsi eguneraketa eskuragarriak</string>
    <string name="notify_on">Bistarazi jakinarazpena eguneraketak eskuragarri daudenean</string>
    <string name="app_details">Aplikazioaren xehetasunak</string>
@ -150,7 +146,6 @@
    <string name="repos_unchanged">Biltegi guztiak egunean daude</string>
    <string name="all_other_repos_fine">Beste biltegiek ez dute errorerik sortu.</string>
    <string name="global_error_updating_repos">Errorea eguneratzean: %s</string>
-    <string name="update_interval_zero">Ez eguneratu automatikoki aplikazio zerrenda</string>
    <string name="menu_bitcoin">Bitcoin</string>
    <string name="menu_litecoin">Litecoin</string>
    <string name="menu_flattr">Flattr</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -6,9 +6,6 @@
    <string name="updates">به‌روزرسانی‌ها</string>
    <string name="other">دیگر</string>
    <string name="update_interval">به‌روزرسانی دوره‌ای خودکار</string>
-    <string name="update_interval_zero">به‌روزرسانی‌ نکردن خودکار فهرست برنامه‌ ها</string>
-    <string name="automatic_scan_wifi">فقط روی وای‌فای</string>
-    <string name="automatic_scan_wifi_on">به‌روز رسانی خودکار  فقط روی شبکه‌های اندازه‌گیری نشده مثل وای‌فای</string>
    <string name="notify_on">نمایش یک اعلان هنگام موجود بودن به‌روز رسانی‌ها</string>
    <string name="no_such_app">چنین کاره‌ای پیدا نشد.</string>
    <string name="about_title">دربارهٔ F-Droid</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">Päivitykset</string>
    <string name="other">Muu</string>
    <string name="update_interval">Automaattisen päivityksen tiheys</string>
-    <string name="update_interval_zero">Ei automaattisia sovellusluetteloiden päivityksiä</string>
-    <string name="automatic_scan_wifi">Vain Wi-Fi -yhteydellä</string>
-    <string name="automatic_scan_wifi_on">Päivitä automaattisesti vain rajoittamattomissa verkoissa, kuten Wi-Fi</string>
    <string name="notify">Päivitysimoitukset</string>
    <string name="notify_on">Näytä iIlmoitus, kun päivityksiä on saatavilla</string>
    <string name="system_installer">Etuoikeutettu laajennus</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">Mises à jour</string>
    <string name="other">Autres</string>
    <string name="update_interval">Intervalle de mise à jour automatique</string>
-    <string name="update_interval_zero">Aucune mise à jour automatique de la liste d\'applis</string>
-    <string name="automatic_scan_wifi">Uniquement via Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Mise à jour automatique uniquement sur des réseaux sans restriction, comme le Wi-Fi</string>
    <string name="notify">Afficher les mises à jour disponibles</string>
    <string name="notify_on">Afficher une notification quand des mises à jour sont disponibles</string>
    <string name="system_installer">Permissions étendues</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -6,7 +6,6 @@
    <string name="cache_downloaded">Manter apps na caché</string>
    <string name="updates">Actualizacións</string>
    <string name="other">Outro</string>
-    <string name="automatic_scan_wifi">Só mediante wifi</string>
    <string name="notify">Amosar actualizacións disponíbeis</string>
    <string name="app_details">Detalles da ap</string>
    <string name="no_such_app">Non se atopou ese aplicativo.</string>
@ -64,7 +63,6 @@
    <string name="enable_nfc_send">Activar envío NFC…</string>
    <string name="unstable_updates">Actualizacións inestables</string>
    <string name="update_interval">Intervalo de actualización automática</string>
-    <string name="automatic_scan_wifi_on">Actualizar automáticamente só en redes con acceso ilimitado, como as Wi-Fi</string>
    <string name="notify_on">Amosar unha notificación cando hai actualizacións dispoñibles</string>
    <string name="system_installer_on">Utiliza F-Droid Privileged Extension para instalar, actualizar e eleminar
        paquetes
@ -212,7 +210,6 @@
    <string name="theme_dark">Oscuro</string>
    <string name="theme_night">Nocturno</string>
    <string name="unstable_updates_summary">Suxire actualizacións para versións inestables</string>
-    <string name="update_interval_zero">Non actualizar automáticamente o listado de aplicativos</string>
    <string name="uninstall_system_summary">Abre a pantalla de detalles da Privileged Extension para
        actualizala/desinstalala
    </string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -9,8 +9,6 @@
    <string name="other">אחר</string>

    <string name="update_interval">תדירות עדכון אוטומטי</string>
-    <string name="automatic_scan_wifi">רק על גבי רשת אלחוטית</string>
-    <string name="automatic_scan_wifi_on">עדכון רשימות יישומונים אוטומטית רק על גבי רשת אלחוטית</string>
    <string name="notify">הצגת עדכונים זמינים</string>
    <string name="notify_on">הצגת התרעה כאשר יש עדכונים</string>
    <string name="system_installer">הרחבה מועדפת</string>
@ -273,7 +271,6 @@
    <string name="install_confirm_update_system">להתקין עדכון ליישומון מובנה זה? המידע הנוכחי שלך לא יאבד. היישומון העדכני יקבל גישה אל:</string>
    <string name="install_confirm_update_no_perms">להתקין עדכון ליישומון קיים זה? המידע הנוכחי שלך לא יאבד. פעולה זו אינה מצריכה הרשאת גישה מיוחדת.</string>
    <string name="install_confirm_update_system_no_perms">להתקין עדכון ליישומון מובנה זה? המידע הנוכחי שלך לא יאבד. פעולה זו אינה מצריכה גישה מיוחדת.</string>
-    <string name="update_interval_zero">אין עדכוני רשימות יישומונים אוטומטית</string>
    <string name="menu_bitcoin">Bitcoin</string>
    <string name="menu_litecoin">Litecoin</string>
    <string name="menu_flattr">Flattr</string>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -9,9 +9,6 @@
    <string name="other">अन्य</string>

    <string name="update_interval">स्वचालित अद्यतन अंतराल</string>
-    <string name="update_interval_zero">कोई स्वचालित एप्लिकेशन अद्यतन नहीं</string>
-    <string name="automatic_scan_wifi">केवल Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">एप्लिकेशन सूचि केवल Wi-Fi पे अपडेट करें</string>
    <string name="notify">नवीनतम सूचनाएं</string>
    <string name="notify_on">सूचित कर्रे जब नवीनतम उपलब्ध हो</string>
    <string name="local_repo_name">स्थानीय कोष का नाम</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -19,9 +19,6 @@
    <string name="other">Ostalo</string>

    <string name="update_interval">Interval automatskog ažuriranja</string>
-    <string name="update_interval_zero">Bez automatskog ažuriranja popisa aplikacija</string>
-    <string name="automatic_scan_wifi">Samo na Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Ažuriraj popis aplikacija automatski samo na Wi-Fi</string>
    <string name="update_auto_download">Automatski preuzmi ažuriranja</string>
    <string name="update_auto_download_summary">Preuzmi datoteke ažuriranja u pozadini</string>
    <string name="notify">Obavijesti ažuriranja</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -7,9 +7,6 @@
    <string name="updates">Frissítések</string>
    <string name="other">Egyéb</string>
    <string name="update_interval">Automatikus frissítés időköze</string>
-    <string name="update_interval_zero">Ne frissítsen automatikusan</string>
-    <string name="automatic_scan_wifi">Csak Wi-Fin</string>
-    <string name="automatic_scan_wifi_on">Automatikus frissítés csak forgalomkorlát nélküli kapcsolatokon, például Wi-Fin</string>
    <string name="notify">Elérhető frissítések megjelenítése</string>
    <string name="notify_on">Értesítés megjelenítése, ha frissítés érhető el</string>
    <string name="app_details">Alkalmazás részletei</string>
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@ -135,7 +135,6 @@
    <string name="notification_action_install">Տեղադրել</string>

    <string name="keep_install_history_summary">Պահել տեղադրման և ապատեղադրման լոգերը F-Droidում</string>
-    <string name="automatic_scan_wifi">Միայն Wi-Fiով</string>
    <string name="notify">Թարմացման ծանուցումներ</string>
    <string name="notify_on">Երբ թարմացում է հասանելի՝ ցույց տալ ծանուցում</string>
    <string name="no_such_app">Այդպիսի ափփ չի գտնվել</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -13,10 +13,6 @@
    <string name="other">Lainnya</string>

    <string name="update_interval">Selang waktu pembaruan otomatis</string>
-    <string name="update_interval_zero">Jangan perbarui otomatis daftar aplikasi</string>
-    <string name="automatic_scan_wifi">Hanya pada Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Hanya perbarui secara otomatis pada jaringan tak terbatas seperti Wi-Fi
-    </string>
    <string name="notify">Tampilkan pembaruan yang tersedia</string>
    <string name="notify_on">Beri tahu jika pembaruan aplikasi tersedia</string>
    <string name="system_installer_on">Gunakan F-Droid Privileged Extension untuk memasang, memperbarui, dan mencopot
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@ -12,7 +12,6 @@
    <string name="other">Annað</string>

    <string name="update_interval">Bil milli sjálfvirkra uppfærslna</string>
-    <string name="automatic_scan_wifi">Aðeins á þráðlausu neti</string>
    <string name="update_auto_download">Ná sjálfkrafa í uppfærslur</string>
    <string name="update_auto_download_summary">Sækja uppfærsluskrárnar í bakgrunni og þú færð tilkynningu um að setja þær upp</string>
    <string name="update_auto_install">Setja uppfærslur upp sjálfkrafa</string>
@ -264,10 +263,6 @@
    <string name="swap_join_same_wifi">Tengstu sama þráðlausa Wi-Fi netinu og vinur þinn</string>
    <string name="swap_intro">Tengstu fólki í nágrenninu og skipstu á forritum við það.</string>
    <string name="swap_qr_isnt_for_swap">QR-kóðinn sem þú skannaðir lítur ekki út eins og býttikóði.</string>
-    <string name="update_interval_zero">Engar sjálfvirkar uppfærslur forritalista</string>
-    <string name="automatic_scan_wifi_on">Einungis uppfæra sjálfvirkt þegar tengst er kostnaðarlausum netkerfum á borð
-        við Wi-Fi netum
-    </string>
    <string name="system_installer_on">Nota forgangsviðbót F-Droid (privileged extension) til að setja upp, uppfæra og
        fjarlægja pakka
    </string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -12,9 +12,6 @@
    <string name="updates">Aggiornamenti</string>
    <string name="other">Altro</string>
    <string name="update_interval">Intervallo degli aggiornamenti automatici</string>
-    <string name="update_interval_zero">Non aggiornare automaticamente l\'elenco delle applicazioni</string>
-    <string name="automatic_scan_wifi">Solo via Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Aggiorna automaticamente gli elenchi applicazioni solo via Wi-Fi</string>
    <string name="notify">Mostra aggiornamenti disponibili</string>
    <string name="notify_on">Mostra una notifica quando sono disponibili aggiornamenti</string>
    <string name="system_installer">Estensione priviliegiata</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">アップデート</string>
    <string name="other">その他</string>
    <string name="update_interval">自動更新の間隔</string>
-    <string name="update_interval_zero">アプリリストの自動更新を行わない</string>
-    <string name="automatic_scan_wifi">Wi-Fi接続時のみ</string>
-    <string name="automatic_scan_wifi_on">Wi-Fiなどの従量課金制ではないネットワークのみで自動更新を行います</string>
    <string name="notify">利用可能な更新を表示</string>
    <string name="notify_on">アップデートが利用可能になると通知を表示します</string>
    <string name="system_installer">特権拡張機能</string>
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@ -201,7 +201,6 @@
    <string name="enable_nfc_send">Rmed Tuzna NFC …</string>
    <string name="unstable_updates">Ileqman ur yerkiden ara</string>
    <string name="keep_install_history">Ḥrez amazray n usebded</string>
-    <string name="automatic_scan_wifi">Ala γef Wi-Fi</string>
    <string name="notify">Sken ileqman yellan</string>
    <string name="system_installer">Isiγzaf Yettwasirgen</string>
    <string name="uninstall_system">Leqqem/Kkes asiγzef yettwasirgen</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">업데이트</string>
    <string name="other">기타</string>
    <string name="update_interval">자동 업데이트 간격</string>
-    <string name="update_interval_zero">자동으로 앱 목록을 업데이트하지 않기</string>
-    <string name="automatic_scan_wifi">Wi-Fi에서만</string>
-    <string name="automatic_scan_wifi_on">Wi-Fi와 같이 추가 요금이 부과되지 않는 네트워크에서만 자동으로 업데이트합니다</string>
    <string name="notify">사용 가능한 업데이트 보이기</string>
    <string name="notify_on">업데이트가 사용 가능할 때 알림을 보여줍니다</string>
    <string name="system_installer">특별 권한 확장 기능</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -6,7 +6,6 @@
    <string name="updates">Atnaujinimai</string>
    <string name="other">Kita</string>
    <string name="update_interval">Automatinis programų sąrašų naujinimas</string>
-    <string name="automatic_scan_wifi">Tik prisijungus prie belaidžio (WiFi)</string>
    <string name="notify">Informuoti</string>
    <string name="notify_on">Pranešti, kai atsiras atnaujinimų</string>
    <string name="local_repo_name">Šio įrenginio saugyklos pavadinimas</string>
@ -133,6 +132,5 @@
    <string name="keep_install_history">Saugoti įdiegimų istoriją</string>
    <string name="keep_install_history_summary">Saugoti log bylą visiems įdiegimams ir išdiegimams F-Droid programėlėje</string>
    <string name="force_old_index">Priversti senąjį indeksavimo formatą</string>
-    <string name="update_interval_zero">Nėra automatinio programėlių sąrašo atnaujinimų</string>
    <string name="update_auto_download_summary">Atnaujinimai parsiunčiami automatiškai o Jūs perspėjami juos instaliuoti</string>
 </resources>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@ -7,9 +7,6 @@
    <string name="updates">Atjauninājumi</string>
    <string name="other">Cits</string>
    <string name="update_interval">Automātisko atjauninājumu intervāls</string>
-    <string name="update_interval_zero">Neatjaunināt aplikāciju sarakstu automātiski</string>
-    <string name="automatic_scan_wifi">Tikai pa Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Atjaunināt automātiski tikai tīklos bez limitiem, kā, piemēram, Wi-Fi</string>
    <string name="notify">Parādīt pieejamos atjauninājumus</string>
    <string name="notify_on">Ziņot, kad atjauninājumi pieejami</string>
    <string name="system_installer">Priviliģētais Pievienojums</string>
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@ -20,6 +20,4 @@
    <string name="other">Други</string>

    <string name="update_interval">Автоматско ажурирање временски интервал</string>
-    <string name="update_interval_zero">Нема листа на автоматски ажурирања на апликацијата</string>
-    <string name="automatic_scan_wifi">Само на Wi-Fi</string>
 </resources>
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@ -93,9 +93,6 @@
    <string name="other">മറ്റുള്ളവ</string>

    <string name="update_interval">സ്വതവേ പുതുക്കലിന്റെ ഇടവേള</string>
-    <string name="update_interval_zero">പ്രയോഗ പട്ടിക സ്വതവേ പുതുക്കേണ്ട</string>
-    <string name="automatic_scan_wifi">വൈ-ഫൈ യിൽ മാത്രം</string>
-    <string name="automatic_scan_wifi_on">വൈഫൈ പോലെ പരിധിയില്ലാത്ത ശൃഖലകളിൽ മാത്രം സ്വതവേ പുതുക്കുക</string>
    <string name="update_auto_download">പുതുക്കലുകള്‍ സ്വതവേ ലഭ്യമാക്കുക</string>
    <string name="update_auto_download_summary">പുതുക്കലുകള്‍ സ്വതവേ ഡൗൺലോഡ് ചെയ്യുകയും അവ സ്ഥാപിക്കാന്‍ നിങ്ങളെ വിവരം അറിയിക്കുകയും ചെയ്യുക</string>
    <string name="update_auto_install">പുതുക്കലുകള്‍ സ്വതവേ സ്ഥാപിക്കുക</string>
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@ -17,9 +17,6 @@
    <string name="other">တျခား</string>

    <string name="update_interval">အလိုအေလ်ာက္ အသစ္မြမ္းမံမႈ interval</string>
-    <string name="update_interval_zero">အလိုအေလ်ာက္ app စာရင္းအသစ္မြမ္းမံမႈမ်ားမေတြ႕ရပါ</string>
-    <string name="automatic_scan_wifi">ဝိုင္ဖိုင္ျဖင့္သာ</string>
-    <string name="automatic_scan_wifi_on">ဝိုင္ဖိုင္ျဖင့္သာ app စာရင္းမ်ားကိုအလိုအေလ်ာက္ျပဳလုပ္မည္</string>
    <string name="update_auto_download">အသစ္မြမ္းမံမႈမ်ားကိုအလိုအေလ်ာက္ေဒါင္းလုတ္ဆြဲမည္</string>
    <string name="update_auto_download_summary">အေနာက္ပိုင္းတြင္ အသစ္မြမ္းမံမႈမ်ားကိုေဒါင္းလုတ္ဆြဲမည္</string>
    <string name="notify">အသစ္မြမ္းမံမႈ အသိေပးခ်က္မ်ား</string>
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@ -8,9 +8,6 @@
    <string name="updates">Oppdateringer</string>
    <string name="other">Andre</string>
    <string name="update_interval">Intervall for automatisk oppdatering</string>
-    <string name="update_interval_zero">Ingen automatisk oppdatering av pakkebrønner</string>
-    <string name="automatic_scan_wifi">Bare på trådløst</string>
-    <string name="automatic_scan_wifi_on">Bare oppdater automatisk når tilknyttet Wi-Fi</string>
    <string name="notify">Vis tilgjengelig oppdateringer</string>
    <string name="notify_on">Varsle når nye oppdateringer er tilgjengelige</string>
    <string name="system_installer">Priviligert tillegg</string>
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@ -95,9 +95,6 @@
    <string name="other">Overig</string>

    <string name="update_interval">Automatisch update-interval</string>
-    <string name="update_interval_zero">Geen automatische applijstupdates</string>
-    <string name="automatic_scan_wifi">Alleen via wifi</string>
-    <string name="automatic_scan_wifi_on">Alleen automatisch bijwerken op verbindingen zonder datalimiet gelijk wifi</string>
    <string name="update_auto_download">Download updates automatisch</string>
    <string name="update_auto_download_summary">Updates worden automatisch gedownload in de achtergrond en der wordt een melding weergegeven voor ze te installeren</string>
    <string name="update_auto_install">Installeer updates automatisch</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">Updates</string>
    <string name="other">Overig</string>
    <string name="update_interval">Automatisch update-interval</string>
-    <string name="update_interval_zero">Geen automatische app-lijstupdates</string>
-    <string name="automatic_scan_wifi">Alleen via wifi</string>
-    <string name="automatic_scan_wifi_on">Update alleen automatisch op verbinding zonder datalimiet zoals wifi</string>
    <string name="notify">Toon beschikbare updates</string>
    <string name="notify_on">Toon een melding wanneer er updates beschikbaar zijn</string>
    <string name="system_installer">Systeemrechtenextensie</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -123,9 +123,6 @@
        usunięcie jej danych i ustawień)
    </string>
    <string name="update_interval">Okres pomiędzy sprawdzaniem aktualizacji</string>
-    <string name="automatic_scan_wifi">Aktualizuj tylko przez Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Aktualizuj listę aplikacji tylko przez nietaryfowe połączenia, np. Wi-Fi
-    </string>
    <string name="notify_on">Wyświetlaj powiadomienie gdy znalezione zostaną nowe aktualizacje</string>
    <string name="uninstall_system">Aktualizuj/odinstaluj uprzywilejowany dodatek F-Droida</string>
    <string name="uninstall_system_summary">Pokaż szczegóły uprzywilejowanego dodatku</string>
@ -198,7 +195,6 @@
    <string name="swap_success">Wymiana powiodła się!</string>
    <string name="swap_active_hotspot">%1$s (Twój hostpot)</string>
    <string name="swap_switch_to_wifi">Dotknij by połączyć się z tą inną siecią Wi-Fi</string>
-    <string name="update_interval_zero">Wyłącz automatyczne aktualizacje</string>
    <string name="about_source">Kod źródłowy</string>
    <string name="not_on_same_wifi">Twoje urządzenie nie jest w tej samej sieci Wi-Fi co lokalne repozytorium które
        zostało dodane! Spróbuj połączyć się z siecią %s
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -12,10 +12,6 @@
    <string name="updates">Atualizações</string>
    <string name="other">Outros</string>
    <string name="update_interval">Intervalo de atualização automática</string>
-    <string name="update_interval_zero">Não atualizar a lista de aplicativos automaticamente</string>
-    <string name="automatic_scan_wifi">Apenas com Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Atualizar automaticamente apenas em redes com acesso ilimitado, como Wi-Fi
-    </string>
    <string name="notify">Mostras atualizações disponíveis</string>
    <string name="notify_on">Mostrar uma notificação quando atualizações estiverem disponíveis</string>
    <string name="system_installer">Extensão privilegiada</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -17,10 +17,6 @@
    <string name="other">Outro</string>

    <string name="update_interval">Intervalo de atualização automática</string>
-    <string name="update_interval_zero">Não atualizar automaticamente a lista de aplicações</string>
-    <string name="automatic_scan_wifi">Apenas por Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Apenas atualizar a lista de aplicações se estiver ligado a redes Wi-Fi
-    </string>
    <string name="notify">Mostrar atualizações disponíveis</string>
    <string name="notify_on">Mostrar uma notificação se existirem atualizações disponíveis</string>
    <string name="system_installer">Extensão privilegiada</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -42,7 +42,6 @@

    <string name="enable_nfc_send">Activează trimiterea prin NFC…</string>
    <string name="update_interval">Interval actualizări automate</string>
-    <string name="automatic_scan_wifi">Doar prin Wi-Fi</string>
    <string name="unstable_updates">Actualizări instabile</string>
    <string name="login_name">Nume utilizator</string>
    <string name="login_password">Parola</string>
@ -51,11 +50,9 @@
    <string name="login_title">Necesită autentificare</string>
    <string name="system_installer">Extensie privilegiată</string>
    <string name="unstable_updates_summary">Sugerează actualizări și la versiunile instabile</string>
-    <string name="update_interval_zero">Nu actualiza automat lista de pachete</string>
    <string name="repo_error_empty_username">Nume utilizator gol, autentificare neschimbată</string>

    <string name="repo_edit_credentials">Schimbă parola</string>
-    <string name="automatic_scan_wifi_on">Actualizează automat doar prin rețele necontorizate precum Wi-Fi</string>
    <string name="local_repo_name">Numele depozitului local</string>
    <string name="local_repo_name_summary">Titlu depozitului local folosit la anunțare: %s</string>
    <string name="notify_on">Arată o notificare atunci când există actualizări ale aplicațiilor</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -9,11 +9,6 @@
    <string name="updates">Обновления</string>
    <string name="other">Прочее</string>
    <string name="update_interval">Интервал автоматического обновления</string>
-    <string name="update_interval_zero">Не обновлять список приложений автоматически</string>
-    <string name="automatic_scan_wifi">Только по Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Обновлять автоматически только по нелимитированным соединениям (таким как
-        Wi-Fi)
-    </string>
    <string name="notify">Показывать доступные обновления</string>
    <string name="notify_on">Отображать уведомление когда есть обновления</string>
    <string name="system_installer">Привилегированное расширение</string>
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@ -9,11 +9,6 @@
    <string name="updates">Agiornamentos</string>
    <string name="other">Àteru</string>
    <string name="update_interval">Intervallu agiornamentu automàticu</string>
-    <string name="update_interval_zero">Non che agiornes automaticamente sa lista de sas aplicatziones</string>
-    <string name="automatic_scan_wifi">Cun su Wi-Fi ebbia</string>
-    <string name="automatic_scan_wifi_on">Agiorna automaticamente sa lista de sas aplicatziones petzi si b\'est su
-        wifi
-    </string>
    <string name="notify">Ammustra sos agiornamentos disponìbiles</string>
    <string name="notify_on">Averte cando bi sunt agiornamentos disponìbiles</string>
    <string name="system_installer">Estensione cun permissos de sistema</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -14,10 +14,6 @@
    <string name="updates">Obnovy</string>
    <string name="other">Iné</string>
    <string name="update_interval">Interval automat. aktualizácií</string>
-    <string name="update_interval_zero">Automaticky neobnovovať zoznam</string>
-    <string name="automatic_scan_wifi">Iba cez Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Automaticky aktualizovať len na nespoplatnených sieťach, ako napr. Wi-Fi
-    </string>
    <string name="notify">Zobraziť dostupné aktualizácie</string>
    <string name="notify_on">Upozorniť na dostupnosť aktualizácií</string>
    <string name="system_installer">Ukladať balíky do vyr. pamäte</string>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -47,9 +47,6 @@
    <string name="other">Ostalo</string>

    <string name="update_interval">Interval samodejnega posodabljanja</string>
-    <string name="update_interval_zero">Samodejno osveževanje seznama aplikacij onemogočeno</string>
-    <string name="automatic_scan_wifi">Samo na Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Posodobi seznam aplikacij samo na Wi-Fi</string>
    <string name="notify_on">Prikaži obvestilo, ko so na voljo posodobitve</string>
 <string name="back">Nazaj</string>
    <string name="menu_settings">Nastavitve</string>
--- a/app/src/main/res/values-sn/strings.xml
+++ b/app/src/main/res/values-sn/strings.xml
@ -11,9 +11,6 @@
        meF-Droid
    </string>
    <string name="update_interval">Chimirwa chakanatswa chiri automatic</string>
-    <string name="update_interval_zero">Hapana mitara iri automatic yezvakanatswa zvema app</string>
-    <string name="automatic_scan_wifi">Pamasaisai eWi-Fi chete</string>
-    <string name="automatic_scan_wifi_on">Natsa zviriautomatic pamasaisai asiri metered kunge Wi-Fi chete</string>
    <string name="update_auto_download">Tutunura zvekunatsa zviri automatic</string>
    <string name="update_auto_download_summary">Tutunura faira rekunatsa kuseri kwezvaurikuita iyezvino</string>
    <string name="update_auto_install">Vakirira zvekunatsa zviri automatic</string>
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@ -13,7 +13,6 @@
    <string name="other">Tjetër</string>

    <string name="update_interval">Intervali i përditësimeve automatike</string>
-    <string name="automatic_scan_wifi">Vetëm me Wi-Fi</string>
    <string name="about_title">Rreth F-Droid</string>
    <string name="about_version">Verzioni:</string>
    <string name="about_source">Burimi i kodit:</string>
@ -122,8 +121,6 @@
    <string name="keep_install_history_summary">Mbaje raportin e të gjitha instalimeve dhe çinstalimeve mbrenda F-Droid</string>
    <string name="force_old_index">Forcoje formën e vjetër të indeksit</string>
    <string name="force_old_index_summary">Në rast të gabimeve ose problemeve të pajtueshmërisë, përdoreni XML indeksin e aplikacioneve</string>
-    <string name="update_interval_zero">Mos të freskohet lista e aplikacioneve</string>
-    <string name="automatic_scan_wifi_on">Freskoje vetëm në rrjete të pamatura si Wi-Fi</string>
    <string name="update_auto_download">Merr freskimet automatikisht</string>
    <string name="update_auto_download_summary">Freskimet shkarkohen automatikisht dhe ti njoftohesh për të instaluar ato</string>
    <string name="update_auto_install">Automatikisht instaloje freskimet</string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -11,9 +11,6 @@
    <string name="updates">Надоградње</string>
    <string name="other">Остало</string>
    <string name="update_interval">Међувреме самосталног освежавања</string>
-    <string name="update_interval_zero">Без самосталног освежавања списка надоградњи</string>
-    <string name="automatic_scan_wifi">Само на бежичној мрежи</string>
-    <string name="automatic_scan_wifi_on">Самостално освежавање само на бесплатним мрежама као што је бежична</string>
    <string name="notify">Прикажи доступне надоградње</string>
    <string name="notify_on">Приказ обавештења о доступним надоградњама</string>
    <string name="system_installer">Повлашћено проширење</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">Uppdateringar</string>
    <string name="other">Andra</string>
    <string name="update_interval">Automatiskt uppdateringsintervall</string>
-    <string name="update_interval_zero">Inga automatiska applistuppdateringar</string>
-    <string name="automatic_scan_wifi">Endast via Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Uppdatera endast automatiskt på obegränsade nätverk som Wi-Fi</string>
    <string name="notify">Visa tillgängliga uppdateringar</string>
    <string name="notify_on">Visa avisering när uppdateringar finns tillgängliga</string>
    <string name="system_installer">Privilegierad utökning</string>
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@ -10,8 +10,6 @@
    <string name="unstable_updates">உறுதியற்ற மேம்பாடுகள்</string>
    <string name="other">பிற</string>

-    <string name="automatic_scan_wifi">Wi-Fi-யில் மட்டும்</string>
-    <string name="automatic_scan_wifi_on">செயலி பட்டியலை Wi-Fi-யில் மட்டும் தானாக புதுப்பி</string>
    <string name="update_auto_download">மேம்பாடுகளை தானாக தறவிறக்கு</string>
    <string name="notify">மேம்படுத்தலுக்கான அறிவிப்புகள்</string>
    <string name="notify_on">மேம்படுத்தல்கள் கிடைக்கப்பெறும் பொழுது அறிவிப்புகளை காண்பி</string>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@ -10,7 +10,6 @@
    <string name="other">อื่นๆ</string>

    <string name="update_interval">อัพเดตข้อมูลอัตโนมัติทุกๆ</string>
-    <string name="automatic_scan_wifi">เฉพาะตอนมีสัญญาณ WiFi</string>
    <string name="update_auto_download">ดาวน์โหลดอัพเดตโดยอัตโนมัติ</string>
    <string name="local_repo_name">ชื่อที่ตั้งให้แหล่งโปรแกรมจากเครื่องคุณ</string>
    <string name="login_name">ชื่อผู้ใช้</string>
@ -241,8 +240,6 @@
    <string name="updates">อัพเดต</string>
    <string name="unstable_updates">อัพเดตที่ไม่เสถียร</string>
    <string name="unstable_updates_summary">แนะนำการอัพเดตไปรุ่นที่ไม่เสถียร</string>
-    <string name="update_interval_zero">ไม่อัพเดตข้อมูลรายการโปรแกรมโดยอัตโนมัติ</string>
-    <string name="automatic_scan_wifi_on">อัพเดตข้อมูลรายการโปรแกรมเฉพาะตอนที่ใช้ WiFi</string>
    <string name="update_auto_download_summary">ทำการดาวน์โหลดอัพเดตโปรแกรมแบบเบื้องหลัง</string>
    <string name="notify">การแจ้งเตือนอัพเดต</string>
    <string name="notify_on">แสดงการแจ้งเตือนเมื่อมีอัพเดตให้ดาวน์โหลด</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">Güncellemeler</string>
    <string name="other">Diğer</string>
    <string name="update_interval">Kendiliğinden güncelleme aralığı</string>
-    <string name="update_interval_zero">Kendiliğinden uygulama listesi güncellemesi olmasın</string>
-    <string name="automatic_scan_wifi">Yalnızca Wi-Fi ile</string>
-    <string name="automatic_scan_wifi_on">Yalnızca Wi-Fi gibi ölçümsüz ağlarda kendiliğinden güncelle</string>
    <string name="notify">Kullanılabilir güncellemeleri göster</string>
    <string name="notify_on">Güncellemeler varsa bir bildirim göster</string>
    <string name="system_installer">Ayrıcalıklı Uzantı</string>
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@ -10,7 +10,6 @@
    <string name="cache_downloaded">ئەپلەر غەملەككە چۈشۈرۈلدى</string>
    <string name="updates">يېڭىلانمىلار</string>
    <string name="other">باشقا</string>
-    <string name="automatic_scan_wifi">wifi دىلا</string>
    <string name="notify">ئۇقتۇرۇش</string>
    <string name="app_details">ئەپ تەپسىلاتلىرى</string>
    <string name="no_such_app">بۇنداق ئەپ تېپىلمىدى</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -38,9 +38,6 @@
    <string name="delete">Видалити</string>
    <string name="other">Інше</string>
    <string name="update_interval">Інтервал автооновлення</string>
-    <string name="update_interval_zero">Не оновлювати список застосунків автоматично</string>
-    <string name="automatic_scan_wifi">Тільки через Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Автоматично оновлювати тільки через нелімітовані мережі, такі як Wi-Fi</string>
    <string name="notify_on">Показувати сповіщення коли є доступні оновлення</string>
    <string name="system_installer">Привілейоване розширення</string>
    <string name="system_installer_on">Використовувати привілейоване розширення F-Droid для встановлення, оновлення та
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@ -19,9 +19,6 @@
    <string name="other">دیگر</string>

    <string name="update_interval">خودکار تازہ کاری کرنے کا وقفہ</string>
-    <string name="update_interval_zero">کوئی خودکار ایپ فہرست تازہ کاریاں موجود نہیں</string>
-    <string name="automatic_scan_wifi">صرف وائی فائی پر</string>
-    <string name="automatic_scan_wifi_on">اپلی کیشن کی فہرست صرف وائی فائی پر خود بخود اپڈیٹ کریں</string>
    <string name="notify">تازہ کاریوں کی اطلاعات</string>
    <string name="notify_on">اگر تازہ کاری دستیاب ہیں تو اطلاع دیں</string>
    <string name="system_installer">پریولجڈ ایکس ٹینشن</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -11,9 +11,6 @@
    <string name="updates">Cập nhật</string>
    <string name="other">Khác</string>
    <string name="update_interval">Tự động cập nhật định kì</string>
-    <string name="update_interval_zero">Không tự động cập nhật danh sách ứng dụng</string>
-    <string name="automatic_scan_wifi">Chỉ khi dùng Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Chỉ tự động cập nhật khi dùng các mạng không tính lưu lượng, ví dụ Wi-Fi</string>
    <string name="notify">Hiện các bản cập nhật có sẵn</string>
    <string name="notify_on">Hiện thông báo khi có bản cập nhật</string>
    <string name="system_installer">Phần mở rộng được cấp quyền</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -9,9 +9,6 @@
    <string name="updates">更新</string>
    <string name="other">其他</string>
    <string name="update_interval">自动更新频率</string>
-    <string name="update_interval_zero">不要自动更新应用列表</string>
-    <string name="automatic_scan_wifi">仅在Wi-Fi上</string>
-    <string name="automatic_scan_wifi_on">仅在使用 Wi-Fi 等非计量网络时自动更新</string>
    <string name="notify">显示可用更新</string>
    <string name="notify_on">应用可供更新时显示通知</string>
    <string name="system_installer">特权扩展</string>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@ -7,9 +7,6 @@
    <string name="updates">更新</string>
    <string name="other">其他</string>
    <string name="update_interval">自動更新頻率</string>
-    <string name="update_interval_zero">不要自動更新應用程式目錄</string>
-    <string name="automatic_scan_wifi">只透過 Wi-Fi 更新</string>
-    <string name="automatic_scan_wifi_on">只在使用如 Wi-Fi 等沒有限流量的連線時自動更新</string>
    <string name="notify">顯示可更新的應用程式</string>
    <string name="notify_on">應用程式發佈更新時通知我</string>
    <string name="system_installer">系統權限套件</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -14,9 +14,6 @@
    <string name="other">其它設定</string>

    <string name="update_interval">自動更新間隔</string>
-    <string name="update_interval_zero">不要自動更新應用程式清單</string>
-    <string name="automatic_scan_wifi">僅使用 Wi-Fi 更新</string>
-    <string name="automatic_scan_wifi_on">僅在未計量的網路例如 Wi-Fi 上自動更新</string>
    <string name="notify">顯示可用的更新</string>
    <string name="notify_on">當有可用更新時顯示通知</string>
    <string name="local_repo_name">本地端軟體庫名稱</string>
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@ -1,15 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string-array name="updateIntervalNames">
-        <item>@string/interval_never</item>
-        <item>@string/interval_1h</item>
-        <item>@string/interval_4h</item>
-        <item>@string/interval_12h</item>
-        <item>@string/interval_1d</item>
-        <item>@string/interval_1w</item>
-        <item>@string/interval_2w</item>
-    </string-array>
-
    <string-array name="keepCacheNames">
        <item>@string/keep_hour</item>
        <item>@string/keep_day</item>
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@ -19,16 +19,6 @@
    <string name="install_history_reader_packageName_UNSET">1-THIS MEANS NO APP IS GRANTED ACCESS!</string>
    <string name="install_history_reader_packageName">@string/install_history_reader_packageName_UNSET</string>

-    <string-array name="updateIntervalValues">
-        <item>0</item>
-        <item>1</item>
-        <item>4</item>
-        <item>12</item>
-        <item>24</item>
-        <item>168</item>
-        <item>336</item>
-    </string-array>
-
    <string-array name="keepCacheValues">
        <item>3600000</item>
        <item>86400000</item>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -23,9 +23,11 @@
    <string name="other">Other</string>

    <string name="update_interval">Automatic update interval</string>
-    <string name="update_interval_zero">No automatic app list updates</string>
-    <string name="automatic_scan_wifi">Only on Wi-Fi</string>
-    <string name="automatic_scan_wifi_on">Only update automatically on unmetered networks like Wi-Fi</string>
+    <string name="over_wifi">Over Wi-Fi</string>
+    <string name="over_data">Over data</string>
+    <string name="over_network_always_summary">Always use this connection when available</string>
+    <string name="over_network_on_demand_summary">Only use this connection when I click to download</string>
+    <string name="over_network_never_summary">Never download anything using this connection</string>
    <string name="update_auto_download">Automatically fetch updates</string>
    <string name="update_auto_download_summary">Updates are downloaded automatically and you are notified to install
        them
@ -186,7 +188,7 @@ This often occurs with apps installed via Google Play or other sources, if they
    <string name="categories__empty_state__no_categories">No categories to display</string>

    <string name="preference_category__my_apps">My Apps</string>
-    <string name="preference_manage_installed_apps">Manage Installed Apps</string>
+    <string name="preference_manage_installed_apps">Manage installed apps</string>


    <string name="details_notinstalled">Not installed</string>
@ -242,7 +244,7 @@ This often occurs with apps installed via Google Play or other sources, if they
    <string name="proxy_port_summary">Your proxy\'s port number (e.g. 8118)</string>

    <string name="privacy">Privacy</string>
-    <string name="preventScreenshots_title">Prevent Screenshots</string>
+    <string name="preventScreenshots_title">Prevent screenshots</string>
    <string name="preventScreenshots_summary">Blocks screenshots from being taken and hides app content from recent apps screen</string>

    <string name="panic_app_setting_title">Panic Button App</string>
@ -253,7 +255,7 @@ This often occurs with apps installed via Google Play or other sources, if they
    <string name="panic_app_dialog_message">Are you sure that you want to allow %1$s to trigger destructive panic button actions?</string>
    <string name="allow">Allow</string>

-    <string name="panic_settings">Panic Button Settings</string>
+    <string name="panic_settings">Panic button settings</string>
    <string name="panic_settings_summary">Actions to be taken in case of emergency</string>
    <string name="panic_exit_title">Exit App</string>
    <string name="panic_exit_summary">App will be closed </string>
@ -497,13 +499,13 @@ This often occurs with apps installed via Google Play or other sources, if they
    <string name="installing">Installing…</string>
    <string name="uninstalling">Uninstalling…</string>

-    <string name="interval_never">Never</string>
-    <string name="interval_1h">Hourly</string>
-    <string name="interval_4h">Every 4 hours</string>
-    <string name="interval_12h">Every 12 hours</string>
-    <string name="interval_1d">Daily</string>
-    <string name="interval_1w">Weekly</string>
-    <string name="interval_2w">Every 2 weeks</string>
+    <string name="interval_never">No automatic app updates</string>
+    <string name="interval_1h">Check for updates hourly</string>
+    <string name="interval_4h">Check for updates every 4 hours</string>
+    <string name="interval_12h">Check for updates every 12 hours</string>
+    <string name="interval_1d">Check for updates daily</string>
+    <string name="interval_1w">Check for updates weekly</string>
+    <string name="interval_2w">Check for updates every 2 weeks</string>

    <string name="keep_hour">1 Hour</string>
    <string name="keep_day">1 Day</string>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -23,7 +23,7 @@
        <item name="appListItem">#ffffff</item>
        <item name="lightGrayTextColor">#a6a6a6</item>
        <item name="antiFeaturesWarning">@drawable/ic_warning_white_24dp</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
    </style>

    <style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@ -48,7 +48,7 @@
        <item name="appListItem">#424242</item>
        <item name="lightGrayTextColor">#4a4a4a</item>
        <item name="antiFeaturesWarning">@drawable/ic_warning_black_24dp</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
    </style>

    <style name="AppBaseThemeNight" parent="AppThemeDark">
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@ -1,158 +1,184 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-        <PreferenceScreen android:title="@string/about_title">
-            <intent
+<android.support.v7.preference.PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.v7.preference.PreferenceScreen android:title="@string/about_title">
+        <intent
                android:action="android.intent.action.MAIN"
                android:targetPackage="@string/applicationId"
-                android:targetClass="org.fdroid.fdroid.AboutActivity" />
-        </PreferenceScreen>
-    <PreferenceCategory android:title="@string/preference_category__my_apps">
-        <PreferenceScreen android:title="@string/preference_manage_installed_apps">
+                android:targetClass="org.fdroid.fdroid.AboutActivity"/>
+    </android.support.v7.preference.PreferenceScreen>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/preference_category__my_apps">
+        <android.support.v7.preference.PreferenceScreen android:title="@string/preference_manage_installed_apps">
            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="@string/applicationId"
-                android:targetClass="org.fdroid.fdroid.views.installed.InstalledAppsActivity" />
-        </PreferenceScreen>
-        <PreferenceScreen
-            android:title="@string/menu_manage"
-            android:summary="@string/repositories_summary">
+                    android:action="android.intent.action.MAIN"
+                    android:targetPackage="@string/applicationId"
+                    android:targetClass="org.fdroid.fdroid.views.installed.InstalledAppsActivity"/>
+        </android.support.v7.preference.PreferenceScreen>
+        <android.support.v7.preference.PreferenceScreen
+                android:title="@string/menu_manage"
+                android:summary="@string/repositories_summary">
            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="@string/applicationId"
-                android:targetClass="org.fdroid.fdroid.views.ManageReposActivity" />
-        </PreferenceScreen>
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/updates">
-        <ListPreference android:title="@string/update_interval"
-            android:key="updateInterval"
-            android:defaultValue="24"
-            android:entries="@array/updateIntervalNames"
-            android:entryValues="@array/updateIntervalValues" />
-        <CheckBoxPreference android:title="@string/automatic_scan_wifi"
-            android:defaultValue="false"
-            android:key="updateOnWifiOnly" />
-        <CheckBoxPreference android:title="@string/update_auto_download"
-            android:summary="@string/update_auto_download_summary"
-            android:defaultValue="false"
-            android:key="updateAutoDownload" />
-        <CheckBoxPreference android:title="@string/notify"
-            android:defaultValue="true"
-            android:key="updateNotify" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/display"
-                        android:key="pref_category_display">
-        <ListPreference android:title="@string/pref_language"
-            android:key="language"/>
-        <ListPreference android:title="@string/theme"
-            android:key="theme"
-            android:defaultValue="light"
-            android:entries="@array/themeNames"
-            android:entryValues="@array/themeValues" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/appcompatibility">
-        <CheckBoxPreference android:title="@string/show_incompat_versions"
-            android:defaultValue="false"
-            android:key="incompatibleVersions" />
-        <CheckBoxPreference android:title="@string/show_root_apps"
-            android:defaultValue="true"
-            android:key="rooted" />
-        <CheckBoxPreference android:title="@string/show_anti_feature_apps"
-            android:defaultValue="false"
-            android:key="showAntiFeatureApps" />
-        <CheckBoxPreference android:title="@string/force_touch_apps"
-            android:defaultValue="false"
-            android:key="ignoreTouchscreen" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/local_repo">
+                    android:action="android.intent.action.MAIN"
+                    android:targetPackage="@string/applicationId"
+                    android:targetClass="org.fdroid.fdroid.views.ManageReposActivity"/>
+        </android.support.v7.preference.PreferenceScreen>
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/updates">
+        <android.support.v7.preference.SeekBarPreference
+                android:key="overWifi"
+                android:title="@string/over_wifi"
+                android:layout="@layout/preference_seekbar"/>
+        <android.support.v7.preference.SeekBarPreference
+                android:key="overData"
+                android:title="@string/over_data"
+                android:layout="@layout/preference_seekbar"/>
+        <SwitchPreference
+                android:title="@string/update_auto_download"
+                android:summary="@string/update_auto_download_summary"
+                android:defaultValue="false"
+                android:key="updateAutoDownload"/>
+        <android.support.v7.preference.SeekBarPreference
+                android:key="updateIntervalSeekBarPosition"
+                android:title="@string/update_interval"
+                android:layout="@layout/preference_seekbar"/>
+        <SwitchPreference
+                android:title="@string/notify"
+                android:defaultValue="true"
+                android:key="updateNotify"/>
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/display"
+                                                      android:key="pref_category_display">
+        <ListPreference
+                android:title="@string/pref_language"
+                android:key="language"/>
+        <ListPreference
+                android:title="@string/theme"
+                android:key="theme"
+                android:defaultValue="light"
+                android:entries="@array/themeNames"
+                android:entryValues="@array/themeValues"/>
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/appcompatibility">
+        <SwitchPreference
+                android:title="@string/show_incompat_versions"
+                android:defaultValue="false"
+                android:key="incompatibleVersions"/>
+        <SwitchPreference
+                android:title="@string/show_root_apps"
+                android:defaultValue="true"
+                android:key="rooted"/>
+        <SwitchPreference
+                android:title="@string/show_anti_feature_apps"
+                android:defaultValue="false"
+                android:key="showAntiFeatureApps"/>
+        <SwitchPreference
+                android:title="@string/force_touch_apps"
+                android:defaultValue="false"
+                android:key="ignoreTouchscreen"/>
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/local_repo">
        <EditTextPreference
-            android:key="localRepoName"
-            android:title="@string/local_repo_name" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/proxy" >
-        <CheckBoxPreference
-            android:key="useTor"
-            android:summary="@string/useTorSummary"
-            android:title="@string/useTor" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="enableProxy"
-            android:title="@string/enable_proxy_title"
-            android:summary="@string/enable_proxy_summary" />
+                android:key="localRepoName"
+                android:title="@string/local_repo_name"/>
+    </android.support.v7.preference.PreferenceCategory>
+
+    <android.support.v7.preference.PreferenceCategory android:title="@string/proxy">
+        <SwitchPreference
+                android:key="useTor"
+                android:summary="@string/useTorSummary"
+                android:title="@string/useTor"/>
+        <SwitchPreference
+                android:defaultValue="false"
+                android:key="enableProxy"
+                android:title="@string/enable_proxy_title"
+                android:summary="@string/enable_proxy_summary"/>
        <EditTextPreference
-            android:key="proxyHost"
-            android:title="@string/proxy_host"
-            android:summary="@string/proxy_host_summary"
-            android:dependency="enableProxy" />
+                android:key="proxyHost"
+                android:title="@string/proxy_host"
+                android:summary="@string/proxy_host_summary"
+                android:dependency="enableProxy"/>
        <EditTextPreference
-            android:key="proxyPort"
-            android:title="@string/proxy_port"
-            android:summary="@string/proxy_port_summary"
-            android:dependency="enableProxy" />
-    </PreferenceCategory>
+                android:key="proxyPort"
+                android:title="@string/proxy_port"
+                android:summary="@string/proxy_port_summary"
+                android:dependency="enableProxy"/>
+    </android.support.v7.preference.PreferenceCategory>

-    <PreferenceCategory
-        android:key="pref_category_privacy"
-        android:title="@string/privacy">
+    <android.support.v7.preference.PreferenceCategory
+            android:key="pref_category_privacy"
+            android:title="@string/privacy">

-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="preventScreenshots"
-            android:summary="@string/preventScreenshots_summary"
-            android:title="@string/preventScreenshots_title"/>
+        <SwitchPreference
+                android:defaultValue="false"
+                android:key="preventScreenshots"
+                android:summary="@string/preventScreenshots_summary"
+                android:title="@string/preventScreenshots_title"/>

-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="hideOnLongPressSearch"
-            android:summary="@string/hide_on_long_search_press_summary"
-            android:title="@string/hide_on_long_search_press_title"/>
+        <SwitchPreference
+                android:defaultValue="false"
+                android:key="hideOnLongPressSearch"
+                android:summary="@string/hide_on_long_search_press_summary"
+                android:title="@string/hide_on_long_search_press_title"/>

-        <PreferenceScreen
-            android:summary="@string/panic_settings_summary"
-            android:title="@string/panic_settings">
+        <android.support.v7.preference.PreferenceScreen
+                android:summary="@string/panic_settings_summary"
+                android:title="@string/panic_settings">
            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetClass="org.fdroid.fdroid.views.panic.PanicPreferencesActivity"
-                android:targetPackage="@string/applicationId"/>
-        </PreferenceScreen>
+                    android:action="android.intent.action.MAIN"
+                    android:targetClass="org.fdroid.fdroid.views.panic.PanicPreferencesActivity"
+                    android:targetPackage="@string/applicationId"/>
+        </android.support.v7.preference.PreferenceScreen>

-    </PreferenceCategory>
+    </android.support.v7.preference.PreferenceCategory>

-    <PreferenceCategory android:title="@string/other"
-        android:key="pref_category_other">
-        <ListPreference android:title="@string/cache_downloaded"
-            android:key="keepCacheFor"
-            android:defaultValue="86400000"
-            android:entries="@array/keepCacheNames"
-            android:entryValues="@array/keepCacheValues" />
-        <CheckBoxPreference android:title="@string/expert"
-            android:defaultValue="false"
-            android:key="expert" />
+    <android.support.v7.preference.PreferenceCategory
+            android:title="@string/other"
+            android:key="pref_category_other">
+        <ListPreference
+                android:title="@string/cache_downloaded"
+                android:key="keepCacheFor"
+                android:defaultValue="86400000"
+                android:entries="@array/keepCacheNames"
+                android:entryValues="@array/keepCacheValues"/>
+        <SwitchPreference
+                android:title="@string/expert"
+                android:defaultValue="false"
+                android:key="expert"/>
        <CheckBoxPreference
-            android:key="unstableUpdates"
-            android:title="@string/unstable_updates"
-            android:summary="@string/unstable_updates_summary"
-            android:defaultValue="false"
-            android:dependency="expert" />
+                android:key="unstableUpdates"
+                android:title="@string/unstable_updates"
+                android:summary="@string/unstable_updates_summary"
+                android:defaultValue="false"
+                android:dependency="expert"/>
        <CheckBoxPreference
-            android:key="keepInstallHistory"
-            android:title="@string/keep_install_history"
-            android:summary="@string/keep_install_history_summary"
-            android:defaultValue="false"
-            android:dependency="expert" />
+                android:key="keepInstallHistory"
+                android:title="@string/keep_install_history"
+                android:summary="@string/keep_install_history_summary"
+                android:defaultValue="false"
+                android:dependency="expert"/>
        <CheckBoxPreference
                android:key="forceOldIndex"
                android:title="@string/force_old_index"
                android:summary="@string/force_old_index_summary"
                android:defaultValue="false"
-                android:dependency="expert" />
-        <CheckBoxPreference android:title="@string/system_installer"
-            android:defaultValue="false"
-            android:key="privilegedInstaller"
-            android:persistent="false"
-            android:dependency="expert" />
-        <Preference android:title="@string/uninstall_system"
-            android:summary="@string/uninstall_system_summary"
-            android:key="uninstallPrivilegedApp"
-            android:dependency="expert" />
-    </PreferenceCategory>
-</PreferenceScreen>
+                android:dependency="expert"/>
+        <CheckBoxPreference
+                android:title="@string/system_installer"
+                android:defaultValue="false"
+                android:key="privilegedInstaller"
+                android:persistent="false"
+                android:dependency="expert"/>
+        <Preference
+                android:title="@string/uninstall_system"
+                android:summary="@string/uninstall_system_summary"
+                android:key="uninstallPrivilegedApp"
+                android:dependency="expert"/>
+    </android.support.v7.preference.PreferenceCategory>
+
+</android.support.v7.preference.PreferenceScreen>
--- a/app/src/main/res/xml/preferences_panic.xml
+++ b/app/src/main/res/xml/preferences_panic.xml
@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<android.support.v7.preference.PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools">

-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="pref_panic_exit"
-        android:summary="@string/panic_exit_summary"
-        android:title="@string/panic_exit_title"/>
+    <android.support.v7.preference.CheckBoxPreference
+            android:defaultValue="true"
+            android:key="pref_panic_exit"
+            android:summary="@string/panic_exit_summary"
+            android:title="@string/panic_exit_title"/>

-    <PreferenceCategory
-        android:key="pref_panic_destructive_actions"
-        android:title="@string/panic_destructive_actions">
+    <android.support.v7.preference.PreferenceCategory
+            android:key="pref_panic_destructive_actions"
+            android:title="@string/panic_destructive_actions">

-        <ListPreference
-            android:key="pref_panic_app"
-            android:summary="@string/panic_app_setting_summary"
-            android:title="@string/panic_app_setting_title"
-            tools:icon="@drawable/ic_cancel"/>
+        <android.support.v7.preference.ListPreference
+                android:key="pref_panic_app"
+                android:summary="@string/panic_app_setting_summary"
+                android:title="@string/panic_app_setting_title"
+                tools:icon="@drawable/ic_cancel"/>

-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:enabled="false"
-            android:key="pref_panic_hide"
-            android:summary="@string/panic_hide_summary"
-            android:title="@string/panic_hide_title"/>
+        <android.support.v7.preference.CheckBoxPreference
+                android:defaultValue="false"
+                android:enabled="false"
+                android:key="pref_panic_hide"
+                android:summary="@string/panic_hide_summary"
+                android:title="@string/panic_hide_title"/>

-    </PreferenceCategory>
+    </android.support.v7.preference.PreferenceCategory>

-</PreferenceScreen>
+</android.support.v7.preference.PreferenceScreen>