convert "Update Interval" preference to a SeekBar

This commit is contained in:
Hans-Christoph Steiner 2018-04-24 20:03:51 +02:00
parent f15c85146d
commit 801d1693a7
64 changed files with 140 additions and 114 deletions

View File

@ -4,6 +4,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.Build;
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,7 +42,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
}
}
public static final String PREF_UPDATE_INTERVAL = "updateInterval";
public static final String PREF_UPDATE_INTERVAL = "updateIntervalSeekBarPosition";
public static final String PREF_UPDATE_ON_WIFI_ONLY = "updateOnWifiOnly";
public static final String PREF_AUTO_DOWNLOAD_INSTALL_UPDATES = "updateAutoDownload";
public static final String PREF_UPDATE_NOTIFICATION_ENABLED = "updateNotify";
@ -75,7 +76,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
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_UPDATE_INTERVAL = 24;
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 +96,9 @@ 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";
public enum Theme {
light,
dark,
@ -102,6 +106,16 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
lightWithDarkActionBar, // Obsolete
}
private 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 +175,41 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
/**
* Get the update interval in milliseconds.
*/
public int getUpdateInterval() {
int hours;
try {
String value = preferences.getString(PREF_UPDATE_INTERVAL,
String.valueOf(DEFAULT_UPDATE_INTERVAL));
hours = Integer.parseInt(value);
} catch (NumberFormatException e) {
hours = DEFAULT_UPDATE_INTERVAL;
public long getUpdateInterval() {
int position = preferences.getInt(PREF_UPDATE_INTERVAL, DEFAULT_UPDATE_INTERVAL);
return UPDATE_INTERVAL_VALUES[position];
}
/**
* The original preference was a {@link String}, now it must be a {@link Integer}
* since {@link android.support.v7.preference.SeekBarPreference} uses it
* directly.
*/
public void migrateUpdateIntervalStringToInt() {
if (!preferences.contains(OLD_PREF_UPDATE_INTERVAL)) {
return; // already completed
}
return hours * 60 * 60 * 1000;
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;
}
preferences.edit()
.putInt(PREF_UPDATE_INTERVAL, updateInterval)
.remove(OLD_PREF_UPDATE_INTERVAL)
.apply();
}
/**

View File

@ -130,7 +130,7 @@ 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();
long interval = Preferences.get().getUpdateInterval();
if (Build.VERSION.SDK_INT < 21) {
Intent intent = new Intent(context, UpdateService.class);

View File

@ -11,9 +11,9 @@ 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,6 +29,7 @@ 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_UPDATE_INTERVAL,
@ -49,7 +50,18 @@ 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 SeekBarPreference updateIntervalSeekBar;
private CheckBoxPreference enableProxyCheckPref;
private CheckBoxPreference useTorCheckPref;
private Preference updateAutoDownloadPref;
@ -58,12 +70,17 @@ public class PreferencesFragment extends PreferenceFragment
@Override
public void onCreatePreferences(Bundle bundle, String s) {
Preferences.get().migrateUpdateIntervalStringToInt();
addPreferencesFromResource(R.xml.preferences);
useTorCheckPref = (CheckBoxPreference) findPreference(Preferences.PREF_USE_TOR);
enableProxyCheckPref = (CheckBoxPreference) findPreference(Preferences.PREF_ENABLE_PROXY);
updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES);
updatePrivilegedExtensionPref = findPreference(Preferences.PREF_UNINSTALL_PRIVILEGED_APP);
updateIntervalSeekBar = (SeekBarPreference) findPreference(Preferences.PREF_UPDATE_INTERVAL);
ListPreference languagePref = (ListPreference) findPreference(Preferences.PREF_LANGUAGE);
if (Build.VERSION.SDK_INT >= 24) {
PreferenceCategory category = (PreferenceCategory) findPreference("pref_category_display");
@ -97,17 +114,12 @@ public class PreferencesFragment extends PreferenceFragment
switch (key) {
case Preferences.PREF_UPDATE_INTERVAL:
ListPreference listPref = (ListPreference) findPreference(
Preferences.PREF_UPDATE_INTERVAL);
int interval = Integer.parseInt(listPref.getValue());
Preference onlyOnWifi = findPreference(
Preferences.PREF_UPDATE_ON_WIFI_ONLY);
onlyOnWifi.setEnabled(interval > 0);
if (interval == 0) {
listPref.setSummary(R.string.update_interval_zero);
} else {
listPref.setSummary(listPref.getEntry());
}
updateIntervalSeekBar.setMax(Preferences.UPDATE_INTERVAL_VALUES.length - 1);
updateIntervalSeekBar.setDefaultValue(Preferences.DEFAULT_UPDATE_INTERVAL);
int seekBarPosition = updateIntervalSeekBar.getValue();
Preference onlyOnWifi = findPreference(Preferences.PREF_UPDATE_ON_WIFI_ONLY);
onlyOnWifi.setEnabled(seekBarPosition > 0);
updateIntervalSeekBar.setSummary(UPDATE_INTERVAL_NAMES[seekBarPosition]);
break;
case Preferences.PREF_UPDATE_ON_WIFI_ONLY:

View File

@ -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>

View File

@ -15,7 +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>

View File

@ -67,7 +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)

View File

@ -9,7 +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>

View File

@ -19,7 +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>

View File

@ -12,7 +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

View File

@ -85,7 +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>

View File

@ -8,7 +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>

View File

@ -282,7 +282,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>

View File

@ -14,7 +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>

View File

@ -9,7 +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

View File

@ -9,7 +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>

View File

@ -99,7 +99,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

View File

@ -9,7 +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>

View File

@ -14,7 +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>

View File

@ -150,7 +150,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>

View File

@ -6,7 +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>

View File

@ -9,7 +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>

View File

@ -9,7 +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>

View File

@ -212,7 +212,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>

View File

@ -273,7 +273,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>

View File

@ -9,7 +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>

View File

@ -19,7 +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>

View File

@ -7,7 +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>

View File

@ -13,7 +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>

View File

@ -264,7 +264,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>

View File

@ -12,7 +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>

View File

@ -9,7 +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>

View File

@ -9,7 +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>

View File

@ -133,6 +133,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>

View File

@ -7,7 +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>

View File

@ -20,6 +20,5 @@
<string name="other">Други</string>
<string name="update_interval">Автоматско ажурирање временски интервал</string>
<string name="update_interval_zero">Нема листа на автоматски ажурирања на апликацијата</string>
<string name="automatic_scan_wifi">Само на Wi-Fi</string>
</resources>

View File

@ -93,7 +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>

View File

@ -17,7 +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>

View File

@ -8,7 +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>

View File

@ -95,7 +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>

View File

@ -9,7 +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>

View File

@ -198,7 +198,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

View File

@ -12,7 +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>

View File

@ -17,7 +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>

View File

@ -51,7 +51,6 @@
<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>

View File

@ -9,7 +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)

View File

@ -9,7 +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

View File

@ -14,7 +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>

View File

@ -47,7 +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>

View File

@ -11,7 +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>

View File

@ -122,7 +122,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>

View File

@ -11,7 +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>

View File

@ -9,7 +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>

View File

@ -241,7 +241,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>

View File

@ -9,7 +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>

View File

@ -38,7 +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>

View File

@ -19,7 +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>

View File

@ -11,7 +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>

View File

@ -9,7 +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>

View File

@ -7,7 +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>

View File

@ -14,7 +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>

View File

@ -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>

View File

@ -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>

View File

@ -23,7 +23,6 @@
<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="update_auto_download">Automatically fetch updates</string>
@ -497,13 +496,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>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<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
@ -26,12 +27,10 @@
</android.support.v7.preference.PreferenceCategory>
<android.support.v7.preference.PreferenceCategory android:title="@string/updates">
<android.support.v7.preference.ListPreference
<android.support.v7.preference.SeekBarPreference
android:key="updateIntervalSeekBarPosition"
android:title="@string/update_interval"
android:key="updateInterval"
android:defaultValue="24"
android:entries="@array/updateIntervalNames"
android:entryValues="@array/updateIntervalValues"/>
android:layout="@layout/preference_seekbar"/>
<android.support.v7.preference.CheckBoxPreference
android:title="@string/only_on_wifi"
android:defaultValue="false"