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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Feb 15 16:48:31 UTC 2019


 android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java |   11 -----
 android/app/src/main/res/layout/activity_main.xml                      |   20 +---------
 2 files changed, 3 insertions(+), 28 deletions(-)

New commits:
commit 5a3a90c5ec82e1e82df6fee6d21d0b14c18f6821
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Thu Feb 14 13:21:00 2019 +0300
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Feb 15 17:48:14 2019 +0100

    Remove unnecessary button from ui and make webview fullscreen.
    
    Change-Id: Ia07dc38b9394b0ae174ec112d828b858990488c3
    Signed-off-by: Gülşah Köse <gulsah.kose at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/67815
    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/MainActivity.java b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
index bbf038b6f..87047f17d 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
@@ -137,16 +137,7 @@ public class MainActivity extends AppCompatActivity {
                 urlToLoad +
                 "&closebutton=1&permission=edit" +
                 "&debug=true"); // TODO remove later?
-
-        Button jsButton = findViewById(R.id.js_button);
-        jsButton.setOnClickListener(new View.OnClickListener() {
-                                        @Override
-                                        public void onClick(View v) {
-                                            browser.loadUrl("javascript:helloFromJavascript()");
-                                        }
-                                    }
-        );
-    }
+        }
 
     @Override
     protected void onResume() {
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index 5ae664ca6..244e1bb99 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -9,24 +9,8 @@
     <WebView
         android:id="@+id/browser"
         android:layout_width="match_parent"
-        android:layout_height="365dp"
+        android:layout_height="match_parent"
         tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="0dp" />
-
-    <Button
-        android:id="@+id/js_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="162dp"
-        android:layout_marginLeft="162dp"
-        android:layout_marginTop="166dp"
-        android:layout_marginEnd="162dp"
-        android:layout_marginRight="162dp"
-        android:layout_marginBottom="149dp"
-        android:text="Call JS"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/browser" />
+        tools:layout_editor_absoluteY="-6dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>


More information about the Libreoffice-commits mailing list