android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java | 6 ------ 1 file changed, 6 deletions(-)
New commits: commit 1fd62785c3ccbd58a71d835d12fb54c96fd8de74 Author: Michael Meeks <michael.me...@collabora.com> AuthorDate: Wed Feb 12 13:55:32 2020 +0000 Commit: Mert Tümer <mert.tu...@collabora.com> CommitDate: Wed Feb 12 15:06:03 2020 +0100 android: remove obsolete drawLayout animation. Fixes crash on pressing 'new document' Change-Id: Ibc1aecbb2e4efb5920da564fa21cf754bf69cfa3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88539 Tested-by: Mert Tümer <mert.tu...@collabora.com> Reviewed-by: Mert Tümer <mert.tu...@collabora.com> diff --git a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java index 10fc735af..b40c3120f 100644 --- a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java +++ b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java @@ -159,10 +159,8 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings private boolean isFabMenuOpen = false; private FloatingActionButton editFAB; private FloatingActionButton writerFAB; - private FloatingActionButton drawFAB; private FloatingActionButton impressFAB; private FloatingActionButton calcFAB; - private LinearLayout drawLayout; private LinearLayout writerLayout; private LinearLayout impressLayout; private LinearLayout calcLayout; @@ -333,13 +331,11 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings private void expandFabMenu() { ViewCompat.animate(editFAB).rotation(45.0F).withLayer().setDuration(300).setInterpolator(new OvershootInterpolator(10.0F)).start(); - drawLayout.startAnimation(fabOpenAnimation); impressLayout.startAnimation(fabOpenAnimation); writerLayout.startAnimation(fabOpenAnimation); calcLayout.startAnimation(fabOpenAnimation); writerFAB.setClickable(true); impressFAB.setClickable(true); - drawFAB.setClickable(true); calcFAB.setClickable(true); isFabMenuOpen = true; } @@ -348,11 +344,9 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings ViewCompat.animate(editFAB).rotation(0.0F).withLayer().setDuration(300).setInterpolator(new OvershootInterpolator(10.0F)).start(); writerLayout.startAnimation(fabCloseAnimation); impressLayout.startAnimation(fabCloseAnimation); - drawLayout.startAnimation(fabCloseAnimation); calcLayout.startAnimation(fabCloseAnimation); writerFAB.setClickable(false); impressFAB.setClickable(false); - drawFAB.setClickable(false); calcFAB.setClickable(false); isFabMenuOpen = false; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits