empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

make QuickCamera unclickable

Browse source 
Closes #3652
fixes #3629
// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-13 12:49:26 -07:00 • committed by Moxie Marlinspike
parent 1bea12f746
commit 8c63211aaf
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java
View file

@ -273,10 +273,8 @@ public class QuickAttachmentDrawer extends ViewGroup {
} }
if (slideOffset == COLLAPSED_ANCHOR_POINT && quickCamera.isStarted()) { if (slideOffset == COLLAPSED_ANCHOR_POINT && quickCamera.isStarted()) {
Log.w(TAG, "computeScroll(PAUSE)");
quickCamera.onPause(); quickCamera.onPause();
} else if (slideOffset != COLLAPSED_ANCHOR_POINT && !quickCamera.isStarted()) { } else if (slideOffset != COLLAPSED_ANCHOR_POINT && !quickCamera.isStarted()) {
Log.w(TAG, "computeScroll(RESUME)");
quickCamera.onResume(); quickCamera.onResume();
} }
} }

1
src/org/thoughtcrime/securesms/components/camera/QuickCamera.java
View file

@ -43,6 +43,7 @@ import java.util.List;
super(context, attrs, defStyle); super(context, attrs, defStyle);
cameraHost = new QuickCameraHost(context); cameraHost = new QuickCameraHost(context);
setHost(cameraHost); setHost(cameraHost);
setClickable(false);
} }
@Override @Override