Remove some translations

Rename Privacy settings
2018-02-11 13:20:18 +08:00
1 parent fa3f409a70
commit a56c79d4bb
@@ -578,7 +578,7 @@ public class Settings {
    /********************
     ****** Privacy and Security
     ********************/
-    public static final String KEY_SEC_SECURITY = "enabled_secure";
+    public static final String KEY_SEC_SECURITY = "enable_secure";
    public static final boolean VALUE_SEC_SECURITY = false;

    public static boolean getEnabledSecurity() {
@@ -38,7 +38,7 @@ import com.hippo.ehviewer.ui.fragment.AdvancedFragment;
 import com.hippo.ehviewer.ui.fragment.DownloadFragment;
 import com.hippo.ehviewer.ui.fragment.EhFragment;
 import com.hippo.ehviewer.ui.fragment.ReadFragment;
-import com.hippo.ehviewer.ui.fragment.SecFragment;
+import com.hippo.ehviewer.ui.fragment.PrivacyFragment;
 import com.hippo.util.DrawableManager;

 import java.lang.reflect.Field;
@@ -54,7 +54,7 @@ public final class SettingsActivity extends EhPreferenceActivity {
            DownloadFragment.class.getName(),
            AdvancedFragment.class.getName(),
            AboutFragment.class.getName(),
-            SecFragment.class.getName(),
+            PrivacyFragment.class.getName(),
    };

    private class FakeLayoutInflater extends LayoutInflater {
@@ -33,8 +33,7 @@ import com.hippo.ehviewer.ui.CommonOperations;
 import com.hippo.util.AppHelper;

 public class AboutFragment extends PreferenceFragment
-        implements Preference.OnPreferenceChangeListener,
-        Preference.OnPreferenceClickListener {
+        implements Preference.OnPreferenceClickListener {

    private static final String KEY_AUTHOR = "author";
    private static final String KEY_DONATE = "donate";
@@ -46,7 +45,6 @@ public class AboutFragment extends PreferenceFragment
        addPreferencesFromResource(R.xml.about_settings);

        Preference author = findPreference(KEY_AUTHOR);
-        Preference enableAnalytics = findPreference(Settings.KEY_ENABLE_ANALYTICS);
        Preference donate = findPreference(KEY_DONATE);
        Preference checkForUpdate = findPreference(KEY_CHECK_FOR_UPDATES);

@@ -56,21 +54,8 @@ public class AboutFragment extends PreferenceFragment
        author.setOnPreferenceClickListener(this);
        donate.setOnPreferenceClickListener(this);
        checkForUpdate.setOnPreferenceClickListener(this);
-
-        enableAnalytics.setOnPreferenceChangeListener(this);
    }

-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String key = preference.getKey();
-        if (Settings.KEY_ENABLE_ANALYTICS.equals(key)) {
-            if (newValue instanceof Boolean && (Boolean) newValue) {
-                Analytics.start(getActivity());
-            }
-            return true;
-        }
-        return true;
-    }

    @Override
    public boolean onPreferenceClick(Preference preference) {
@@ -0,0 +1,47 @@
+package com.hippo.ehviewer.ui.fragment;
+
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.text.TextUtils;
+
+import com.hippo.ehviewer.Analytics;
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.Settings;
+
+/**
+ * Created by Mo10 on 2018/2/10.
+ */
+
+public class PrivacyFragment extends PreferenceFragment
+        implements Preference.OnPreferenceChangeListener {
+    private static final String KEY_PATTERN_PROTECTION = "pattern_protection";
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.privacy_settings);
+        Preference enableAnalytics = findPreference(Settings.KEY_ENABLE_ANALYTICS);
+
+        enableAnalytics.setOnPreferenceChangeListener(this);
+    }
+    @Override
+    public void onResume() {
+        super.onResume();
+        Preference patternProtection = findPreference(KEY_PATTERN_PROTECTION);
+        patternProtection.setSummary(TextUtils.isEmpty(Settings.getSecurity()) ?
+                R.string.settings_privacy_pattern_protection_not_set :
+                R.string.settings_privacy_pattern_protection_set);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (Settings.KEY_ENABLE_ANALYTICS.equals(key)) {
+            if (newValue instanceof Boolean && (Boolean) newValue) {
+                Analytics.start(getActivity());
+            }
+            return true;
+        }
+        return true;
+    }
+}
@@ -1,30 +0,0 @@
-package com.hippo.ehviewer.ui.fragment;
-
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.text.TextUtils;
-
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-
-/**
- * Created by Mo10 on 2018/2/10.
- */
-
-public class SecFragment extends PreferenceFragment {
-    private static final String KEY_PATTERN_PROTECTION = "pattern_protection";
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.secure_settings);
-    }
-    @Override
-    public void onResume() {
-        super.onResume();
-        Preference patternProtection = findPreference(KEY_PATTERN_PROTECTION);
-        patternProtection.setSummary(TextUtils.isEmpty(Settings.getSecurity()) ?
-                R.string.settings_advanced_pattern_protection_not_set :
-                R.string.settings_advanced_pattern_protection_set);
-    }
-}
@@ -455,9 +455,9 @@
    <string name="settings_advanced_clear_memory_cache">Borrar caché de memoria</string>
    <string name="settings_advanced_clear_memory_cache_summary">Borrar vistas previas, galerías, información y caché de memoria</string>
    <string name="settings_advanced_read_cache_size">Tamaño del caché (archivos temporales)</string>
-    <string name="settings_advanced_pattern_protection_title">Protección por patrón</string>
-    <string name="settings_advanced_pattern_protection_not_set">No se ha configurado la protección por patrón</string>
-    <string name="settings_advanced_pattern_protection_set">La protección por patrón ha sido configurado</string>
+    <string name="settings_privacy_pattern_protection_title">Protección por patrón</string>
+    <string name="settings_privacy_pattern_protection_not_set">No se ha configurado la protección por patrón</string>
+    <string name="settings_privacy_pattern_protection_set">La protección por patrón ha sido configurado</string>
    <string name="settings_advanced_export_data">Exportar datos</string>
    <string name="settings_advanced_export_data_summary">Guardar datos en almacenamiento externo, tales como la lista de descarga, lista de búsqueda rápida, entre otros</string>
    <string name="settings_advanced_export_data_to">Datos exportados en %s</string>
@@ -479,8 +479,8 @@
    <string name="settings_about_donate_summary">Alipay: seven332$163.com</string>
    <string name="settings_about_donate_message">Tu donación me ayuda a desarrollar más y mejores aplicaciones.\n\nAlipay: seven332$163.com</string>
    <string name="settings_about_donate_toast">Email copiado al portapapeles</string>
-    <string name="settings_about_enable_analytics">Habilitar analytics</string>
-    <string name="settings_about_about_analytics">Acerca de analytics</string>
+    <string name="settings_privacy_enable_analytics">Habilitar analytics</string>
+    <string name="settings_privacy_about_analytics">Acerca de analytics</string>
    <string name="settings_about_version">Versión de compilación</string>
    <string name="settings_about_check_for_updates">Verificar actualizaciones</string>
    <string name="settings_about_beta_update_channel">Canal de versiones de prueba</string>
@@ -617,8 +617,6 @@
    <string name="error_password_cannot_empty">La contraseña no puede estar vacía</string>
    <string name="error_something_wrong_happened">Ocurrió algo malo</string>
    <string name="dialog_archive_title">H@H Downloader</string>
-    <string name="settings_sec">Privacidad y seguridad</string>
-    <string name="settings_sec_secure">Captura de pantalla no permitida</string>
-    <string name="settings_sec_secure_summary">Si está habilitado, no puede tomar capturas de pantalla de la aplicación, y el sistema no mostrará el contenido de la aplicación en el selector de tareas</string>
+    <string name="settings_privacy">Privacidad</string>

 </resources>
@@ -480,9 +480,9 @@
    <string name="settings_advanced_clear_memory_cache">清理内存缓存</string>
    <string name="settings_advanced_clear_memory_cache_summary">清理缩略图、画廊信息的内存缓存</string>
    <string name="settings_advanced_read_cache_size">阅读缓存大小</string>
-    <string name="settings_advanced_pattern_protection_title">图案保护</string>
-    <string name="settings_advanced_pattern_protection_not_set">未设置图案保护</string>
-    <string name="settings_advanced_pattern_protection_set">已设置图案保护</string>
+    <string name="settings_privacy_pattern_protection_title">图案保护</string>
+    <string name="settings_privacy_pattern_protection_not_set">未设置图案保护</string>
+    <string name="settings_privacy_pattern_protection_set">已设置图案保护</string>
    <string name="settings_advanced_export_data">导出数据</string>
    <string name="settings_advanced_export_data_summary">保存数据至外置存储器，例如下载列表，快速搜索列表</string>
    <string name="settings_advanced_export_data_to">已导出数据至 %s</string>
@@ -504,8 +504,8 @@
    <string name="settings_about_donate_summary">支付宝：seven332$163.com</string>
    <string name="settings_about_donate_message">你的捐赠能帮助我开发更多更好的应用。\n\n支付宝：seven332$163.com</string>
    <string name="settings_about_donate_toast">邮箱地址已复制到剪切板</string>
-    <string name="settings_about_enable_analytics">启用数据统计</string>
-    <string name="settings_about_about_analytics">关于数据统计</string>
+    <string name="settings_privacy_enable_analytics">启用数据统计</string>
+    <string name="settings_privacy_about_analytics">关于数据统计</string>
    <string name="settings_about_version">版本号</string>
    <string name="settings_about_check_for_updates">检查更新</string>
    <string name="settings_about_beta_update_channel">更新测试版</string>
@@ -627,8 +627,8 @@
    <string name="download_archive_failure">无法下载压缩包</string>
    <string name="archive">压缩包</string>
    <string name="download_archive_failure_no_hath">下载压缩包需要 H@H 客户端</string>
-    <string name="settings_sec">隐私和安全</string>
-    <string name="settings_sec_secure">不允许屏幕抓取</string>
-    <string name="settings_sec_secure_summary">启用后，将不能截取该应用的屏幕截图，同时，将不会在系统任务切换器中显示该应用的内容预览\n\n重新启动应用以生效此更改</string>
+    <string name="settings_privacy">隐私</string>
+    <string name="settings_privacy_secure">不允许屏幕抓取</string>
+    <string name="settings_privacy_secure_summary">启用后，将不能截取该应用的屏幕截图，同时，将不会在系统任务切换器中显示该应用的内容预览\n\n重新启动应用以生效此更改</string>

 </resources>
@@ -480,9 +480,9 @@
    <string name="settings_advanced_clear_memory_cache">清理內存緩存</string>
    <string name="settings_advanced_clear_memory_cache_summary">清理縮略圖、畫廊信息的內存緩存</string>
    <string name="settings_advanced_read_cache_size">閲讀緩存大小</string>
-    <string name="settings_advanced_pattern_protection_title">圖案保護</string>
-    <string name="settings_advanced_pattern_protection_not_set">未設置圖案保護</string>
-    <string name="settings_advanced_pattern_protection_set">已設置圖案保護</string>
+    <string name="settings_privacy_pattern_protection_title">圖案保護</string>
+    <string name="settings_privacy_pattern_protection_not_set">未設置圖案保護</string>
+    <string name="settings_privacy_pattern_protection_set">已設置圖案保護</string>
    <string name="settings_advanced_export_data">導出數據</string>
    <string name="settings_advanced_export_data_summary">保存數據至外置存儲器，例如下載列表，快速搜索列表</string>
    <string name="settings_advanced_export_data_to">已導出數據至 %s</string>
@@ -504,8 +504,8 @@
    <string name="settings_about_donate_summary">支付寶：seven332$163.com</string>
    <string name="settings_about_donate_message">你的捐贈能幫助我開發更多更好的應用。\n\n支付寶：seven332$163.com</string>
    <string name="settings_about_donate_toast">郵箱地址已複製到剪切板</string>
-    <string name="settings_about_enable_analytics">啟用數據統計</string>
-    <string name="settings_about_about_analytics">關於數據統計</string>
+    <string name="settings_privacy_enable_analytics">啟用數據統計</string>
+    <string name="settings_privacy_about_analytics">關於數據統計</string>
    <string name="settings_about_version">版本號</string>
    <string name="settings_about_check_for_updates">檢查更新</string>
    <string name="settings_about_beta_update_channel">更新測試版</string>
@@ -627,8 +627,8 @@
    <string name="download_archive_failure">無法下載壓縮包</string>
    <string name="archive">壓縮包</string>
    <string name="download_archive_failure_no_hath">下載壓縮包需要 H@H 客户端</string>
-    <string name="settings_sec">隱私和安全</string>
-    <string name="settings_sec_secure">不允許荧幕抓取</string>
-    <string name="settings_sec_secure_summary">啟用後，將不能截取該應用的螢幕截圖，同時，將不會在系統任務切換器中顯示該應用的內容預覽\n\n重新啟動應用以生效此更改</string>
+    <string name="settings_privacy">隱私和安</string>
+    <string name="settings_privacy_secure">不允許荧幕抓取</string>
+    <string name="settings_privacy_secure_summary">啟用後，將不能截取該應用的螢幕截圖，同時，將不會在系統任務切換器中顯示該應用的內容預覽\n\n重新啟動應用以生效此更改</string>

 </resources>
@@ -480,9 +480,9 @@
    <string name="settings_advanced_clear_memory_cache">清除記憶體快取</string>
    <string name="settings_advanced_clear_memory_cache_summary">清除縮圖、圖庫詳細資料的記憶體快取</string>
    <string name="settings_advanced_read_cache_size">閱讀快取大小</string>
-    <string name="settings_advanced_pattern_protection_title">繪圖解鎖</string>
-    <string name="settings_advanced_pattern_protection_not_set">尚未設定繪圖解鎖</string>
-    <string name="settings_advanced_pattern_protection_set">已設定繪圖解鎖</string>
+    <string name="settings_privacy_pattern_protection_title">繪圖解鎖</string>
+    <string name="settings_privacy_pattern_protection_not_set">尚未設定繪圖解鎖</string>
+    <string name="settings_privacy_pattern_protection_set">已設定繪圖解鎖</string>
    <string name="settings_advanced_export_data">匯出檔案</string>
    <string name="settings_advanced_export_data_summary">儲存資料至外接儲存設備，例如下載列表，快速搜尋列表</string>
    <string name="settings_advanced_export_data_to">已匯出資料至 %s</string>
@@ -504,8 +504,8 @@
    <string name="settings_about_donate_summary">支付寶：seven332$163.com</string>
    <string name="settings_about_donate_message">你的贊助能幫助我開發更多更好的軟體。\n\n支付寶：seven332$163.com</string>
    <string name="settings_about_donate_toast">已將電子信箱地址複製到剪貼簿</string>
-    <string name="settings_about_enable_analytics">啟用資料統計</string>
-    <string name="settings_about_about_analytics">關於資料統計</string>
+    <string name="settings_privacy_enable_analytics">啟用資料統計</string>
+    <string name="settings_privacy_about_analytics">關於資料統計</string>
    <string name="settings_about_version">版本號碼</string>
    <string name="settings_about_check_for_updates">檢查更新</string>
    <string name="settings_about_beta_update_channel">更新測試版</string>
@@ -627,8 +627,8 @@
    <string name="download_archive_failure">下載失敗</string>
    <string name="archive">壓縮檔</string>
    <string name="download_archive_failure_no_hath">下載壓縮檔需要 H@H 客戶端</string>
-    <string name="settings_sec">隱私和安全</string>
-    <string name="settings_sec_secure">不允許荧幕抓取</string>
-    <string name="settings_sec_secure_summary">啟用後，將不能截取該應用的螢幕截圖，同時，將不會在系統任務切換器中顯示該應用的內容預覽\n\n重新啟動應用以生效此更改</string>
+    <string name="settings_privacy">隱私</string>
+    <string name="settings_privacy_secure">不允許荧幕抓取</string>
+    <string name="settings_privacy_secure_summary">啟用後，將不能截取該應用的螢幕截圖，同時，將不會在系統任務切換器中顯示該應用的內容預覽\n\n重新啟動應用以生效此更改</string>

 </resources>
@@ -523,9 +523,9 @@
    <string name="settings_advanced_clear_memory_cache">Clear memory cache</string>
    <string name="settings_advanced_clear_memory_cache_summary">Clear thumb, gallery info memory cache</string>
    <string name="settings_advanced_read_cache_size">Read cache size</string>
-    <string name="settings_advanced_pattern_protection_title">Pattern protection</string>
-    <string name="settings_advanced_pattern_protection_not_set">Pattern protection has not been set</string>
-    <string name="settings_advanced_pattern_protection_set">Pattern protection has been set</string>
+    <string name="settings_privacy_pattern_protection_title">Pattern protection</string>
+    <string name="settings_privacy_pattern_protection_not_set">Pattern protection has not been set</string>
+    <string name="settings_privacy_pattern_protection_set">Pattern protection has been set</string>
    <string name="settings_advanced_export_data">Export data</string>
    <string name="settings_advanced_export_data_summary">Save data to external storage, such as download list, quick search list</string>
    <string name="settings_advanced_export_data_to">Exported data to %s</string>
@@ -549,8 +549,8 @@
    <string name="settings_about_donate_summary">Alipay: seven332$163.com</string>
    <string name="settings_about_donate_message">Your donation can help me develop more and better applications.\n\nAlipay: seven332$163.com</string>
    <string name="settings_about_donate_toast">Email address copied to clipboard</string>
-    <string name="settings_about_enable_analytics">Enable analytics</string>
-    <string name="settings_about_about_analytics">About analytics</string>
+    <string name="settings_privacy_enable_analytics">Enable analytics</string>
+    <string name="settings_privacy_about_analytics">About analytics</string>
    <string name="settings_about_version">Build version</string>
    <string name="settings_about_check_for_updates">Check for updates</string>
    <string name="settings_about_beta_update_channel">Beta update channel</string>
@@ -678,8 +678,8 @@
    <string name="download_archive_failure">Failed to download archive</string>
    <string name="archive">Archive</string>
    <string name="download_archive_failure_no_hath">Need H@H client for archive download</string>
-    <string name="settings_sec">Privacy and Security</string>
-    <string name="settings_sec_secure">Not Allowed Screen Capture</string>
-    <string name="settings_sec_secure_summary">If enabled, you cannot take screenshots of the app, and the system will not display app contents in the task switcher\n\nNeed to restart the app for this to take effect</string>
+    <string name="settings_privacy">Privacy</string>
+    <string name="settings_privacy_secure">Not Allowed Screen Capture</string>
+    <string name="settings_privacy_secure_summary">If enabled, you cannot take screenshots of the app, and the system will not display app contents in the task switcher\n\nNeed to restart the app for this to take effect</string>

 </resources>
@@ -72,18 +72,6 @@
        android:summary="@string/settings_about_beta_update_channel_summary"
        android:defaultValue="@bool/beta"/>

-    <com.hippo.preference.SwitchPreference
-        android:key="enable_analytics"
-        android:title="@string/settings_about_enable_analytics"
-        android:defaultValue="true"/>
-
-    <com.hippo.preference.MessagePreference
-        android:key="about_analytics"
-        android:title="@string/settings_about_about_analytics"
-        app:dialogMessage="@string/analytics_explain"
-        app:dialogMessageHtml="true"
-        app:dialogMessageLinkify="true"/>
-
    <Preference
        android:key="donate"
        android:title="@string/settings_about_donate"/>
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.hippo.preference.ActivityPreference
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:key="pattern_protection"
+        android:title="@string/settings_privacy_pattern_protection_title"
+        app:activity="com.hippo.ehviewer.ui.SetSecurityActivity"/>
+
+    <com.hippo.preference.SwitchPreference
+        android:key="enable_secure"
+        android:title="@string/settings_privacy_secure"
+        app:summaryOn="@string/settings_privacy_secure_summary"
+        app:summaryOff="@string/settings_privacy_secure_summary"
+        android:defaultValue="false"/>
+
+    <com.hippo.preference.SwitchPreference
+        android:key="enable_analytics"
+        android:title="@string/settings_privacy_enable_analytics"
+        android:defaultValue="true"/>
+
+    <com.hippo.preference.MessagePreference
+        android:key="about_analytics"
+        android:title="@string/settings_privacy_about_analytics"
+        app:dialogMessage="@string/analytics_explain"
+        app:dialogMessageHtml="true"
+        app:dialogMessageLinkify="true"/>
+</PreferenceScreen>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <com.hippo.preference.ActivityPreference
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:key="pattern_protection"
-        android:title="@string/settings_advanced_pattern_protection_title"
-        app:activity="com.hippo.ehviewer.ui.SetSecurityActivity"/>
-
-    <com.hippo.preference.SwitchPreference
-        android:key="enabled_secure"
-        android:title="@string/settings_sec_secure"
-        app:summaryOn="@string/settings_sec_secure_summary"
-        app:summaryOff="@string/settings_sec_secure_summary"
-        android:defaultValue="false"/>
-</PreferenceScreen>
@@ -34,8 +34,8 @@
        android:icon="@drawable/v_download_primary_x24"/>

    <header
-        android:fragment="com.hippo.ehviewer.ui.fragment.SecFragment"
-        android:title="@string/settings_sec"
+        android:fragment="com.hippo.ehviewer.ui.fragment.PrivacyFragment"
+        android:title="@string/settings_privacy"
        android:icon="@drawable/v_sec_primary_x24"/>

    <header