From 8c63211aafb721bf72e152ffba41f499fc16a776 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Mon, 13 Jul 2015 12:49:26 -0700 Subject: [PATCH] make QuickCamera unclickable Closes #3652 fixes #3629 // FREEBIE --- .../securesms/components/camera/QuickAttachmentDrawer.java | 2 -- .../thoughtcrime/securesms/components/camera/QuickCamera.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java b/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java index e189297dcb..0b34bd4f21 100644 --- a/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java +++ b/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java @@ -273,10 +273,8 @@ public class QuickAttachmentDrawer extends ViewGroup { } if (slideOffset == COLLAPSED_ANCHOR_POINT && quickCamera.isStarted()) { - Log.w(TAG, "computeScroll(PAUSE)"); quickCamera.onPause(); } else if (slideOffset != COLLAPSED_ANCHOR_POINT && !quickCamera.isStarted()) { - Log.w(TAG, "computeScroll(RESUME)"); quickCamera.onResume(); } } diff --git a/src/org/thoughtcrime/securesms/components/camera/QuickCamera.java b/src/org/thoughtcrime/securesms/components/camera/QuickCamera.java index 4eba2df59a..dbcf0032d7 100644 --- a/src/org/thoughtcrime/securesms/components/camera/QuickCamera.java +++ b/src/org/thoughtcrime/securesms/components/camera/QuickCamera.java @@ -43,6 +43,7 @@ import java.util.List; super(context, attrs, defStyle); cameraHost = new QuickCameraHost(context); setHost(cameraHost); + setClickable(false); } @Override