Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd13b33 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up FLAG_TRANSLUCENT_OCCLUDING_ACTIVITY_FIX." into main

parents c1331907 29412b65

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1278,16 +1278,6 @@ flag { 
  }

}



flag {

  name: "translucent_occluding_activity_fix"

  namespace: "systemui"

  description: "Fixes occlusion animation for transluent activities"

  bug: "303010980"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

   namespace: "systemui"

   name: "fetch_bookmarks_xml_keyboard_shortcuts"

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt

+1 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import com.android.internal.annotations.VisibleForTesting 
import com.android.internal.policy.ScreenDecorationsUtils

import com.android.systemui.Flags.animationLibraryDelayLeashCleanup

import com.android.systemui.Flags.moveTransitionAnimationLayer

import com.android.systemui.Flags.translucentOccludingActivityFix

import com.android.systemui.animation.TransitionAnimator.Companion.assertLongLivedReturnAnimations

import com.android.systemui.animation.TransitionAnimator.Companion.assertReturnAnimations

import com.android.systemui.animation.TransitionAnimator.Companion.longLivedReturnAnimationsEnabled
@@ -1442,7 +1441,7 @@ constructor( 
                    controller.createAnimatorState()

                }

            val windowBackgroundColor =

                if (translucentOccludingActivityFix() && window.isTranslucent) {

                if (window.isTranslucent) {

                    Color.TRANSPARENT

                } else {

                    window.taskInfo?.let { callback.getBackgroundColor(it) }

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR 
import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.Flags.notifyPowerManagerUserActivityBackground;

import static com.android.systemui.Flags.simPinBouncerReset;

import static com.android.systemui.Flags.translucentOccludingActivityFix;

import static com.android.systemui.keyguard.ui.viewmodel.LockscreenToDreamingTransitionViewModel.DREAMING_ANIMATION_DURATION_MS;



import android.animation.Animator;
@@ -1131,8 +1130,7 @@ public class KeyguardViewMediator implements CoreStartable, 
                                (int) (fullWidth - initialWidth) /* left */,

                                fullWidth /* right */,

                                mWindowCornerRadius, mWindowCornerRadius);

                    } else if (translucentOccludingActivityFix()

                            && mOccludingRemoteAnimationTarget != null

                    } else if (mOccludingRemoteAnimationTarget != null

                            && mOccludingRemoteAnimationTarget.isTranslucent) {

                        // Animating in a transparent window looks really weird. Just let it be

                        // fullscreen and the app can do an internal animation if it wants to.