[Libreoffice-commits] online.git: android/app
Jan Holesovsky (via logerrit)
logerrit at kemper.freedesktop.org
Wed Dec 11 19:43:12 UTC 2019
android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java | 5
android/app/src/main/java/org/libreoffice/androidapp/LocaleHelper.java | 67 ----------
android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java | 3
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java | 11 -
android/app/src/main/res/values-es/strings.xml | 2
android/app/src/main/res/values-pt-rBR/strings.xml | 4
android/app/src/main/res/values/arrays.xml | 8 -
android/app/src/main/res/values/strings.xml | 2
android/app/src/main/res/xml/libreoffice_preferences.xml | 9 -
9 files changed, 1 insertion(+), 110 deletions(-)
New commits:
commit 1cb4cfe2b1f69d593177aed46eb47e8dceac7b95
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Dec 11 20:13:49 2019 +0100
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Dec 11 20:42:53 2019 +0100
android: Honor the languge setting from the system.
Makes no sense to have an own language switching mechanism in the app...
Change-Id: Ic19bf36e35d1d011a1cd96c17b713e41577c512e
Reviewed-on: https://gerrit.libreoffice.org/84980
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java b/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
index 22594f665..382943ea4 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
@@ -26,11 +26,6 @@ public class LibreOfficeApplication extends Application {
return mainHandler;
}
-
- @Override
- protected void attachBaseContext(Context base) {
- super.attachBaseContext(LocaleHelper.onAttach(base, "en"));
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/app/src/main/java/org/libreoffice/androidapp/LocaleHelper.java b/android/app/src/main/java/org/libreoffice/androidapp/LocaleHelper.java
deleted file mode 100644
index 308f3b8fc..000000000
--- a/android/app/src/main/java/org/libreoffice/androidapp/LocaleHelper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-package org.libreoffice.androidapp;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Build;
-import android.preference.PreferenceManager;
-
-import java.util.Locale;
-
-public class LocaleHelper {
-
- private static final String SELECTED_LANG = "org.libreoffice.selected.lang";
-
- public static Context onAttach(Context context){
- String lang = getPersistedData(context, Locale.getDefault().getLanguage());
- return setLocale(context, lang);
- }
-
- public static Context onAttach(Context context, String defLang){
- String lang = getPersistedData(context, defLang);
- return setLocale(context, lang);
- }
-
- public static Context setLocale(Context context, String lang) {
- persist(context, lang);
- return updateResources(context, lang);
- }
-
- @SuppressWarnings("deprecation")
- private static Context updateResources(Context context, String lang) {
- Locale locale = new Locale(lang);
- Locale.setDefault(locale);
-
- Resources res = context.getResources();
- Configuration cfg = res.getConfiguration();
- cfg.locale = locale;
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
- cfg.setLayoutDirection(locale);
-
- res.updateConfiguration(cfg, res.getDisplayMetrics());
- return context;
- }
-
- private static void persist(Context context, String lang) {
- SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
- preferences.edit().putString(SELECTED_LANG, lang);
- preferences.edit().apply();
- }
-
- private static String getPersistedData(Context context, String lang) {
- SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
- return preferences.getString(SELECTED_LANG, lang);
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
index 75cd9468c..c51d098af 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
@@ -53,9 +53,6 @@ public class SettingsActivity extends AppCompatActivity {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
SettingsListenerModel.getInstance().changePreferenceState(sharedPreferences, key);
- if (key.equals("DISPLAY_LANGUAGE")) {
- getActivity().recreate();
- }
}
}
}
diff --git a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index e0c056862..167ae17c1 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -59,7 +59,6 @@ import com.google.android.material.navigation.NavigationView;
import org.libreoffice.androidapp.AboutDialogFragment;
import org.libreoffice.androidapp.LibreOfficeApplication;
-import org.libreoffice.androidapp.LocaleHelper;
import org.libreoffice.androidapp.R;
import org.libreoffice.androidapp.SettingsActivity;
import org.libreoffice.androidapp.SettingsListenerModel;
@@ -107,7 +106,6 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
private int viewMode;
private int sortMode;
private boolean showHiddenFiles;
- private String displayLanguage;
// dynamic permissions IDs
private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 0;
@@ -132,7 +130,6 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
public static final String SORT_MODE_KEY = "SORT_MODE";
private static final String RECENT_DOCUMENTS_KEY = "RECENT_DOCUMENTS";
private static final String ENABLE_SHOW_HIDDEN_FILES_KEY = "ENABLE_SHOW_HIDDEN_FILES";
- private static final String DISPLAY_LANGUAGE = "DISPLAY_LANGUAGE";
public static final String NEW_FILE_PATH_KEY = "NEW_FILE_PATH_KEY";
public static final String NEW_DOC_TYPE_KEY = "NEW_DOC_TYPE_KEY";
@@ -200,11 +197,6 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
fabCloseAnimation = AnimationUtils.loadAnimation(this, R.anim.fab_close);
}
- @Override
- protected void attachBaseContext(Context newBase) {
- super.attachBaseContext(LocaleHelper.onAttach(newBase, "en"));
- }
-
public void createUI() {
setContentView(R.layout.activity_document_browser);
@@ -940,7 +932,6 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
viewMode = Integer.valueOf(defaultPrefs.getString(EXPLORER_VIEW_TYPE_KEY, "" + GRID_VIEW));
filterMode = Integer.valueOf(defaultPrefs.getString(FILTER_MODE_KEY, "-1"));
showHiddenFiles = defaultPrefs.getBoolean(ENABLE_SHOW_HIDDEN_FILES_KEY, false);
- displayLanguage = defaultPrefs.getString(DISPLAY_LANGUAGE, "en");
Intent i = this.getIntent();
if (i.hasExtra(CURRENT_DIRECTORY_KEY)) {
@@ -962,8 +953,6 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
viewMode = i.getIntExtra(EXPLORER_VIEW_TYPE_KEY, GRID_VIEW);
Log.d(LOGTAG, EXPLORER_VIEW_TYPE_KEY);
}
-
- LocaleHelper.setLocale(this, displayLanguage);
}
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 65d991201..97ec41002 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -25,8 +25,6 @@
<string name="pref_sort_title">Orden de Archivos</string>
<string name="pref_filter_title">Filtro de Archivos Predeterminado</string>
<string name="pref_filter_summary">Establezca quçe filstro de archivo debe usarse de manera predeterminada.</string>
- <string name="display_language">Idioma de visualización</string>
- <string name="display_language_summary">Establecer el idioma de visualización predeterminado</string>
<string name="pref_show_debug_info">Mostrar información de depuración</string>
<string name="pref_show_debug_info_summary">Habilite para mostrar información de depuración en el visor de documentos</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index d0add44cc..2f2635506 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -25,8 +25,6 @@
<string name="pref_sort_title">Ordem padrão</string>
<string name="pref_filter_title">Filtro padrão</string>
<string name="pref_filter_summary">Defina qual o filtro de arquivo que deve ser usado por padrão.</string>
- <string name="display_language">Mostrar idioma</string>
- <string name="display_language_summary">Defina qual o idioma que deve ser usado por padrão</string>
<string name="pref_show_debug_info">Mostrar info de depuração </string>
<string name="pref_show_debug_info_summary">Habilitar info de depuração no document viewer</string>
@@ -141,5 +139,5 @@
<string name="unable_to_go_further">Não foi possível ir mais longe.</string>
<string name="bmp_null">Bmp é nulo!</string>
<string name="directory_not_saved">Diretório não salvo.</string>
- <string name="title_activity_show_html">sobre</string>
+ <string name="title_activity_show_html">Sobre</string>
</resources>
diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index 7adfbd56d..6c7e94b08 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -8,10 +8,6 @@
<item >2</item>
<item >3</item>
</string-array>
- <string-array name="SupportedLanguagesValues">
- <item >en</item>
- <!-- FIXME we need more languages item >tr</item-->
- </string-array>
<string-array name="SortModeStringValues">
<item >0</item>
<item >1</item>
@@ -36,10 +32,6 @@
<item>@string/filter_presentations</item>
<item>@string/filter_drawings</item>
</string-array>
- <string-array name="SupportedLanguages">
- <item>English</item>
- <!-- FIXME we need more languages item>Turkçe</item-->
- </string-array>
<string-array name="SortModeNames">
<item >@string/sort_az</item>
<item >@string/sort_za</item>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index bf434e74d..082374b38 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -25,8 +25,6 @@
<string name="pref_sort_title">File Order</string>
<string name="pref_filter_title">Default File Filter</string>
<string name="pref_filter_summary">Set which file filter should be used by default.</string>
- <string name="display_language">Display Language</string>
- <string name="display_language_summary">Set the default display language</string>
<string name="pref_show_debug_info">Show Debug Info</string>
<string name="pref_show_debug_info_summary">Enable to show debug information in document viewer</string>
diff --git a/android/app/src/main/res/xml/libreoffice_preferences.xml b/android/app/src/main/res/xml/libreoffice_preferences.xml
index 8090a98eb..5f8389d45 100644
--- a/android/app/src/main/res/xml/libreoffice_preferences.xml
+++ b/android/app/src/main/res/xml/libreoffice_preferences.xml
@@ -30,15 +30,6 @@
android:summary="@string/pref_viewmode_summary"
app:iconSpaceReserved="false" />
- <ListPreference
- android:title="@string/display_language"
- android:summary="@string/display_language_summary"
- android:entries="@array/SupportedLanguages"
- android:entryValues="@array/SupportedLanguagesValues"
- android:defaultValue="en"
- android:key="DISPLAY_LANGUAGE"
- app:iconSpaceReserved="false" />
-
<CheckBoxPreference
android:title="@string/pref_show_hidden_files"
android:key="ENABLE_SHOW_HIDDEN_FILES"
More information about the Libreoffice-commits
mailing list