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

Commit dbf172eb authored by Selim Cinek's avatar Selim Cinek
Browse files

Revert "Animate activity when launching over keyguard" 

This reverts commit 468f2d3e.

Breaking emergency dialer
Bug: 112339366

Change-Id: Id1dc7b3b1e0c3628097926c47babfb52d0fdb99c
parent 468f2d3e

core/res/res/anim/keyguard_occlude_open_enter.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:shareInterpolator="false">

    <translate

        android:fromYDelta="90%"

        android:toYDelta="0%"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="400"/>

    <alpha

        android:fromAlpha="0.0"

        android:toAlpha="1.0"

        android:interpolator="@interpolator/fast_out_slow_in"

        android:duration="300"/>

</set>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2161,7 +2161,6 @@ 
  <java-symbol type="anim" name="push_down_out" />

  <java-symbol type="anim" name="push_up_in" />

  <java-symbol type="anim" name="push_up_out" />

  <java-symbol type="anim" name="keyguard_occlude_open_enter" />

  <java-symbol type="anim" name="lock_screen_behind_enter" />

  <java-symbol type="anim" name="lock_screen_behind_enter_wallpaper" />

  <java-symbol type="anim" name="lock_screen_behind_enter_fade_in" />

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java

+8 −8
Original line number Diff line number Diff line
@@ -103,9 +103,9 @@ public class KeyguardClockPositionAlgorithm { 
    private float mDarkAmount;



    /**

     * If keyguard will just fade away or will require a password.

     * If keyguard will require a password or just fade away.

     */

    private boolean mFadeAway;

    private boolean mCurrentlySecure;



    /**

     * Dozing and receiving a notification (AOD notification.)
@@ -135,7 +135,7 @@ public class KeyguardClockPositionAlgorithm { 


    public void setup(int minTopMargin, int maxShadeBottom, int notificationStackHeight,

            float panelExpansion, int parentHeight,

            int keyguardStatusHeight, float dark, boolean fadeAway, boolean pulsing,

            int keyguardStatusHeight, float dark, boolean secure, boolean pulsing,

            int bouncerTop) {

        mMinTopMargin = minTopMargin + mContainerTopPadding;

        mMaxShadeBottom = maxShadeBottom;
@@ -144,7 +144,7 @@ public class KeyguardClockPositionAlgorithm { 
        mHeight = parentHeight;

        mKeyguardStatusHeight = keyguardStatusHeight;

        mDarkAmount = dark;

        mFadeAway = fadeAway;

        mCurrentlySecure = secure;

        mPulsing = pulsing;

        mBouncerTop = bouncerTop;

    }
@@ -198,7 +198,7 @@ public class KeyguardClockPositionAlgorithm { 


        float clockYRegular = getExpandedClockPosition();

        boolean hasEnoughSpace = mMinTopMargin + mKeyguardStatusHeight < mBouncerTop;

        float clockYTarget = !mFadeAway && hasEnoughSpace ?

        float clockYTarget = mCurrentlySecure && hasEnoughSpace ?

                mMinTopMargin : -mKeyguardStatusHeight;



        // Move clock up while collapsing the shade
@@ -218,11 +218,11 @@ public class KeyguardClockPositionAlgorithm { 
     */

    private float getClockAlpha(int y) {

        float alphaKeyguard;

        if (mFadeAway) {

        if (mCurrentlySecure) {

            alphaKeyguard = 1;

        } else {

            alphaKeyguard = Math.max(0, y / Math.max(1f, getExpandedClockPosition()));

            alphaKeyguard = Interpolators.ACCELERATE.getInterpolation(alphaKeyguard);

        } else {

            alphaKeyguard = 1;

        }

        return MathUtils.lerp(alphaKeyguard, 1f, mDarkAmount);

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+1 −2
Original line number Diff line number Diff line
@@ -524,8 +524,7 @@ public class NotificationPanelView extends PanelView implements 
                    totalHeight,

                    mKeyguardStatusView.getHeight(),

                    mInterpolatedDarkAmount,

                    !mStatusBar.isKeyguardCurrentlySecure()

                            || mStatusBar.isKeyguardOccludeAnimationRunning(),

                    mStatusBar.isKeyguardCurrentlySecure(),

                    mPulsing,

                    mBouncerTop);

            mClockPositionAlgorithm.run(mClockPositionResult);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+5 −37
Original line number Diff line number Diff line
@@ -322,8 +322,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
    public static final int FADE_KEYGUARD_START_DELAY = 100;

    public static final int FADE_KEYGUARD_DURATION = 300;

    public static final int FADE_KEYGUARD_DURATION_PULSING = 96;

    public static final int FADE_BACKDROP_DURATION = 300;

    public static final int FADE_BACKDROP_DURATION_FAST = 240;



    /** If true, the system is in the half-boot-to-decryption-screen state.

     * Prudently disable QS and notifications.  */
@@ -545,7 +543,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
    private boolean mIsOccluded;

    private boolean mWereIconsJustHidden;

    private boolean mBouncerWasShowingWhenHidden;

    private boolean mKeyguardOccludeAnimationRunning;



    // Notifies StatusBarKeyguardViewManager every time the keyguard transition is over,

    // this animation is tied to the scrim for historic reasons.
@@ -1644,7 +1641,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        boolean wakeAndUnlock = mBiometricUnlockController != null

            && mBiometricUnlockController.isWakeAndUnlock();

        if (mLaunchTransitionFadingAway && !mIsOccluded || wakeAndUnlock) {

        if (mLaunchTransitionFadingAway || wakeAndUnlock) {

            mBackdrop.setVisibility(View.INVISIBLE);

            Trace.endSection();

            return;
@@ -1763,8 +1760,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                boolean cannotAnimateDoze = mDozing && !ScrimState.AOD.getAnimateChange();

                if (mBiometricUnlockController.getMode()

                        == BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING

                        || hideBecauseOccluded  && !mKeyguardOccludeAnimationRunning

                        || cannotAnimateDoze) {

                        || hideBecauseOccluded || cannotAnimateDoze) {



                    // We are unlocking directly - no animation!

                    mBackdrop.setVisibility(View.GONE);
@@ -1775,9 +1771,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    mBackdrop.animate()

                            .alpha(SRC_MIN_ALPHA)

                            .setInterpolator(Interpolators.ACCELERATE_DECELERATE)

                            .setDuration(

                                    mKeyguardOccludeAnimationRunning

                                            ? FADE_BACKDROP_DURATION_FAST : FADE_BACKDROP_DURATION)

                            .setDuration(300)

                            .setStartDelay(0)

                            .withEndAction(() -> {

                                mBackdrop.setVisibility(View.GONE);
@@ -3673,27 +3667,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
                }).start();

    }



    /**

    * Is keyguard being occluded by a newly launched activity.

    */

    public boolean isKeyguardOccludeAnimationRunning() {

        return mKeyguardOccludeAnimationRunning;

    }



    /**

     * Plays the animation when new activity is launched over keyguard.

     */

    public void animateKeyguardOccluding() {

        mKeyguardOccludeAnimationRunning = true;

        addPostCollapseAction(() -> {

            mStatusBarKeyguardViewManager.reset(true /* hideBouncerWhenShowing */);

            mKeyguardOccludeAnimationRunning = false;

        });

        mStatusBarKeyguardViewManager.animateCollapsePanels(1.0f /* speedfactor */);

        updateScrimController();

        updateMediaMetaData(false /* metaDataChanged */, true /* allowEnterAnimation */);

    }



    /**

     * Plays the animation when an activity that was occluding Keyguard goes away.

     */
@@ -4039,7 +4012,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


    private void showBouncerIfKeyguard() {

        if ((mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)

                && !mKeyguardViewMediator.isHiding() && !mKeyguardOccludeAnimationRunning) {

                && !mKeyguardViewMediator.isHiding()) {

            showBouncer(true /* scrimmed */);

        }

    }
@@ -4539,11 +4512,6 @@ public class StatusBar extends SystemUI implements DemoMode, 


        @Override

        public void onStartedGoingToSleep() {

            // in case we start going to sleep while new animation is launching over keyguard, make

            // sure to finish it

            if (mKeyguardOccludeAnimationRunning) {

                runPostCollapseRunnables();

            }

            notifyHeadsUpGoingToSleep();

            dismissVolumeDialog();

        }
@@ -4785,7 +4753,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    ? ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;

            mScrimController.transitionTo(state);

        } else if (isInLaunchTransition() || mLaunchCameraOnScreenTurningOn

                || launchingAffordanceWithPreview || mKeyguardOccludeAnimationRunning) {

                || launchingAffordanceWithPreview) {

            mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);

        } else if (mBrightnessMirrorVisible) {

            mScrimController.transitionTo(ScrimState.BRIGHTNESS_MIRROR);