[Libreoffice-commits] core.git: 2 commits - android/source Makefile.in

[Christian Lohmaier]

 Makefile.in                                                             |    2 -
 android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java |    5 --
 android/source/src/java/org/mozilla/gecko/gfx/LayerView.java            |   20 ++--------
 3 files changed, 7 insertions(+), 20 deletions(-)

New commits:
commit 372f297de1ed0c3af0fa23dd6ea027035f850207
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun May 28 14:25:54 2017 +0200

    Makefile is generated in BUILDDIR, not SRCDIR (fix fetch for android)
    
    Change-Id: Ieaa4cb0e8d3370154cd1a57d4afaf5bfa715cbc9

diff --git a/Makefile.in b/Makefile.in
index 6aa98cfe97ab..53cb88141121 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,7 +277,7 @@ help showmodules gbuildtojson:
 cross-toolset: bootstrap fetch
 	# fetch again in case there are externals only needed on build platform
 ifneq ($(OS),IOS)
-	$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile fetch
+	$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(BUILDDIR)/Makefile fetch
 endif
 	$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools
 
commit eac12b1fe5108bcd64be37e6011721f8566e2015
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Apr 5 21:42:46 2017 +0200

    android: simplify some more if statements
    
    Change-Id: I49f7069ca774468b4b9d44541238e38edd0f5bd7

diff --git a/android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java b/android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java
index 101afe4b70ac..6b40ae4ba905 100644
--- a/android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java
+++ b/android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java
@@ -41,9 +41,6 @@ public abstract class CommonCanvasElement implements CanvasElement, CanvasElemen
      */
     @Override
     public boolean contains(float x, float y) {
-        if (!isVisible()) {
-            return false;
-        }
-        return onHitTest(x, y);
+        return isVisible() && onHitTest(x, y);
     }
 }
diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
index 41fafd46a3db..05f2118114c8 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -200,37 +200,27 @@ public class LayerView extends FrameLayout {
 
     @Override
     public boolean onKeyPreIme(int keyCode, KeyEvent event) {
-        if (mInputConnectionHandler != null)
-            return mInputConnectionHandler.onKeyPreIme(keyCode, event);
-        return false;
+        return mInputConnectionHandler != null && mInputConnectionHandler.onKeyPreIme(keyCode, event);
     }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (mInputConnectionHandler != null)
-            return mInputConnectionHandler.onKeyDown(keyCode, event);
-        return false;
+        return mInputConnectionHandler != null && mInputConnectionHandler.onKeyDown(keyCode, event);
     }
 
     @Override
     public boolean onKeyLongPress(int keyCode, KeyEvent event) {
-        if (mInputConnectionHandler != null)
-            return mInputConnectionHandler.onKeyLongPress(keyCode, event);
-        return false;
+        return mInputConnectionHandler != null && mInputConnectionHandler.onKeyLongPress(keyCode, event);
     }
 
     @Override
     public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
-        if (mInputConnectionHandler != null)
-            return mInputConnectionHandler.onKeyMultiple(keyCode, repeatCount, event);
-        return false;
+        return mInputConnectionHandler != null && mInputConnectionHandler.onKeyMultiple(keyCode, repeatCount, event);
     }
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (mInputConnectionHandler != null)
-            return mInputConnectionHandler.onKeyUp(keyCode, event);
-        return false;
+        return mInputConnectionHandler != null && mInputConnectionHandler.onKeyUp(keyCode, event);
     }
 
     public boolean isIMEEnabled() {