Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent back gesture during video trimming.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-01-05 17:42:09 -05:00
committed by Alex Hart
parent 8d1a16dcd6
commit e0fb102572
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/scribbles/VideoEditorHud.java
View File

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.scribbles;
import android.animation.Animator;
import android.content.Context;
import android.database.Cursor;
import android.graphics.Rect;
import android.net.Uri;
import android.provider.OpenableColumns;
import android.util.AttributeSet;
@@ -13,6 +14,7 @@ import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.view.ViewCompat;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
@@ -24,6 +26,7 @@ import org.thoughtcrime.securesms.video.VideoUtil;
import org.thoughtcrime.securesms.video.videoconverter.VideoThumbnailsRangeSelectorView;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
/**
@@ -34,6 +37,8 @@ public final class VideoEditorHud extends LinearLayout {
@SuppressWarnings("unused")
private static final String TAG = Log.tag(VideoEditorHud.class);
private final List<Rect> exclusionZone = List.of(new Rect());
private VideoThumbnailsRangeSelectorView videoTimeLine;
private EventListener eventListener;
private View playOverlay;
@@ -67,6 +72,16 @@ public final class VideoEditorHud extends LinearLayout {
this.eventListener = eventListener;
}
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
final Rect outRect = exclusionZone.get(0);
videoTimeLine.getHitRect(outRect);
outRect.left = l;
outRect.right = r;
ViewCompat.setSystemGestureExclusionRects(this, exclusionZone);
super.onLayout(changed, l, t, r, b);
}
@RequiresApi(api = 23)
public void setVideoSource(@NonNull VideoSlide slide, @NonNull VideoBitRateCalculator videoBitRateCalculator, long maxSendSize)
throws IOException