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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Feb 24 12:49:11 UTC 2019


 .gitignore                               |    3 +++
 android/app/.gitignore                   |    1 +
 android/app/src/main/AndroidManifest.xml |    6 +++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 0346ec81abd40635c4e4f67bdfb7c80aef250629
Author:     kaishu-sahu <kaishusahu101 at gmail.com>
AuthorDate: Tue Feb 19 02:13:53 2019 +0530
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Sun Feb 24 13:48:53 2019 +0100

    fix order of elements in 'AndroidManifest.xml' as per guidelines and icon of the android app wasn't reflecting in the launcher
    
    Change-Id: I795f0d63fc352f990215691051fe83a8215c04a4
    Reviewed-on: https://gerrit.libreoffice.org/67989
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/.gitignore b/.gitignore
index 6f4dddc9d..7224fb0b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,3 +116,6 @@ eclipsesettingfile.xml
 .yavide_session
 .vscode
 *.code-workspace
+
+# autoconf stuff
+autogen.input
diff --git a/android/app/.gitignore b/android/app/.gitignore
index 6478cef62..238a7c9a1 100644
--- a/android/app/.gitignore
+++ b/android/app/.gitignore
@@ -1,3 +1,4 @@
 /.externalNativeBuild
 /app.iml
 /build
+/liboSettings.gradle
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b2718a77e..96b8667c3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.libreoffice.androidapp">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -13,6 +16,8 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
 
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />
@@ -76,6 +81,5 @@
         </activity>
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>


More information about the Libreoffice-commits mailing list