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

Add logic to only dismiss header views when in tabletop mode.

Browse source
This commit is contained in:
Alex Hart 2021-08-04 10:53:53 -03:00 • committed by GitHub
parent 9c71994804
commit d43f044eb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
View file

@ -32,6 +32,7 @@ import androidx.viewpager2.widget.ViewPager2;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.google.android.material.button.MaterialButton; import com.google.android.material.button.MaterialButton;
import com.google.common.collect.Sets;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.animation.ResizeAnimation; import org.thoughtcrime.securesms.animation.ResizeAnimation;
@ -812,7 +813,7 @@ public class WebRtcCallView extends ConstraintLayout {
ConstraintSet constraintSet = new ConstraintSet(); ConstraintSet constraintSet = new ConstraintSet();
constraintSet.clone(parent); constraintSet.clone(parent);
for (View view : visibleViewSet) { for (View view : controlsToFade()) {
constraintSet.setVisibility(view.getId(), visibility); constraintSet.setVisibility(view.getId(), visibility);
} }
@ -823,6 +824,14 @@ public class WebRtcCallView extends ConstraintLayout {
layoutParticipants(); layoutParticipants();
} }
private Set<View> controlsToFade() {
if (controls.adjustForFold()) {
return Sets.intersection(topViews, visibleViewSet);
} else {
return visibleViewSet;
}
}
private void fadeInNewUiState(@NonNull Set<View> previouslyVisibleViewSet, boolean useSmallMargins) { private void fadeInNewUiState(@NonNull Set<View> previouslyVisibleViewSet, boolean useSmallMargins) {
Transition transition = new AutoTransition().setDuration(TRANSITION_DURATION_MILLIS); Transition transition = new AutoTransition().setDuration(TRANSITION_DURATION_MILLIS);

2
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java
View file

@ -156,7 +156,7 @@ public final class WebRtcControls {
} }
boolean isFadeOutEnabled() { boolean isFadeOutEnabled() {
return isAtLeastOutgoing() && isRemoteVideoEnabled && foldableState.isFlat(); return isAtLeastOutgoing() && isRemoteVideoEnabled;
} }
boolean displaySmallOngoingCallButtons() { boolean displaySmallOngoingCallButtons() {