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

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java        |    4 ++--
 android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fd4d896a7fc5a2d8d38632840295e224288f215a
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Jul 15 13:57:18 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Jul 15 19:41:44 2019 +0200

    android: Rename the .xml files to avoid potential conflicts.
    
    Change-Id: I6209309c038f16aff150494adf14953aa6f31541

diff --git a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 861c114c4..98ac6f1ce 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -201,7 +201,7 @@ public class LOActivity extends AppCompatActivity {
         sPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         updatePreferences();
 
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.lolib_activity_main);
 
         AssetManager assetManager = getResources().getAssets();
 
@@ -480,7 +480,7 @@ public class LOActivity extends AppCompatActivity {
     private void initiateSlideShow() {
         final AlertDialog slideShowProgress = new AlertDialog.Builder(this)
                 .setCancelable(false)
-                .setView(R.layout.dialog_loading)
+                .setView(R.layout.lolib_dialog_loading)
                 .create();
         new AsyncTask<Void, Void, String>() {
             @Override
diff --git a/android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java b/android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
index 3a957b154..21eeeeb9f 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
@@ -31,7 +31,7 @@ public class SlideShowActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_slide_show);
+        setContentView(R.layout.lolib_activity_slide_show);
         slideShowWebView = findViewById(R.id.slide_show_webView);
         if (savedInstanceState == null) {
             slidesSvgUri = getIntent().getStringExtra(SVG_URI_KEY);
diff --git a/android/lib/src/main/res/layout/activity_main.xml b/android/lib/src/main/res/layout/lolib_activity_main.xml
similarity index 100%
rename from android/lib/src/main/res/layout/activity_main.xml
rename to android/lib/src/main/res/layout/lolib_activity_main.xml
diff --git a/android/lib/src/main/res/layout/activity_slide_show.xml b/android/lib/src/main/res/layout/lolib_activity_slide_show.xml
similarity index 100%
rename from android/lib/src/main/res/layout/activity_slide_show.xml
rename to android/lib/src/main/res/layout/lolib_activity_slide_show.xml
diff --git a/android/lib/src/main/res/layout/dialog_loading.xml b/android/lib/src/main/res/layout/lolib_dialog_loading.xml
similarity index 100%
rename from android/lib/src/main/res/layout/dialog_loading.xml
rename to android/lib/src/main/res/layout/lolib_dialog_loading.xml