[Libreoffice-commits] online.git: android/app

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Apr 16 11:11:38 UTC 2019


 android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java    |   13 +++--
 android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java |   13 +++--
 android/app/src/main/java/org/libreoffice/androidapp/LocaleHelper.java           |   11 +++++
 android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java       |    1 
 android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java  |   13 +++--
 android/app/src/main/java/org/libreoffice/androidapp/ShowHTMLActivity.java       |   22 ++++++----
 6 files changed, 49 insertions(+), 24 deletions(-)

New commits:
commit 5ea28575211a0cc475483892d8d9050d0adc1baf
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Apr 16 13:05:49 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Apr 16 13:09:04 2019 +0200

    android: Update / introduce modelines in the .java files.
    
    Plus some whitespace changes.
    
    Change-Id: Ic35a67ad7f6d911679e6d1f717f340640cbcfee9

diff --git a/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java b/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
index 7105daab1..397cde677 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/AboutDialogFragment.java
@@ -1,10 +1,10 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
+ * This file is part of the LibreOffice project.
  *
- *  * 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/.
- *
+ * 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;
@@ -113,5 +113,6 @@ public class AboutDialogFragment extends DialogFragment {
         return builder.create();
     }
 
-
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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 87f30f817..8ae751e6f 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/LibreOfficeApplication.java
@@ -1,11 +1,10 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
+ * This file is part of the LibreOffice project.
  *
- *  * 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/.
- *
+ * 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;
@@ -31,3 +30,5 @@ public class LibreOfficeApplication extends Application {
         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
index 3c5c78bc2..308f3b8fc 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/LocaleHelper.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/LocaleHelper.java
@@ -1,3 +1,12 @@
+/* -*- 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;
@@ -54,3 +63,5 @@ public class LocaleHelper {
         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 83701f194..e58fc8d4b 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
@@ -6,6 +6,7 @@
  * 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.app.Activity;
diff --git a/android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java b/android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java
index 89bf93f91..c2286bbbc 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/SettingsListenerModel.java
@@ -1,11 +1,12 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
+ * This file is part of the LibreOffice project.
  *
- *  * 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/.
- *
+ * 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.SharedPreferences;
@@ -54,3 +55,5 @@ public class SettingsListenerModel {
         mListener.settingsPreferenceChanged(preferences, key);
     }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/app/src/main/java/org/libreoffice/androidapp/ShowHTMLActivity.java b/android/app/src/main/java/org/libreoffice/androidapp/ShowHTMLActivity.java
index 3458a5ac6..eb73bd2fd 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/ShowHTMLActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/ShowHTMLActivity.java
@@ -1,3 +1,12 @@
+/* -*- 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.Intent;
@@ -26,29 +35,28 @@ import org.libreoffice.androidapp.ui.LibreOfficeUIActivity;
  */
 public class ShowHTMLActivity extends AppCompatActivity {
 
-    private WebView mWebView;
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_show_html);
 
-        mWebView = findViewById(R.id.browser);
+        WebView mWebView = findViewById(R.id.browser);
         mWebView.setWebViewClient(new WebViewClient());
-        mWebView.loadUrl("file:///android_asset/"+getIntent().getStringExtra("path"));
+        mWebView.loadUrl("file:///android_asset/" + getIntent().getStringExtra("path"));
 
-        Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
+        Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setDisplayShowHomeEnabled(true);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent=new Intent(getBaseContext(), LibreOfficeUIActivity.class);
+                Intent intent = new Intent(getBaseContext(), LibreOfficeUIActivity.class);
                 startActivity(intent);
             }
         });
     }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list