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

Commit 78fd51d0 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Don't clear the transient state before the end of hiding animation" into main

parents 4320322b 8a590167

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 


        @Override

        public void hide() {

            clearTransient();

        }

    };

packages/SystemUI/src/com/android/systemui/navigationbar/views/NavigationBar.java

+0 −1
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 


        @Override

        public void hide() {

            clearTransient();

        }

    };

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarOrchestrator.kt

+1 −3
Original line number Diff line number Diff line
@@ -226,9 +226,7 @@ constructor( 
                    return statusBarModeRepository.isTransientShown.value

                }



                override fun hide() {

                    statusBarModeRepository.clearTransient()

                }

                override fun hide() {}

            }

        )

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ import com.android.systemui.statusbar.PowerButtonReveal; 
import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.topui.TopUiController;

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays;

import com.android.systemui.statusbar.core.StatusBarInitializer;

import com.android.systemui.statusbar.core.StatusBarRootModernization;
@@ -227,6 +226,7 @@ import com.android.systemui.statusbar.policy.UserInfoControllerImpl; 
import com.android.systemui.statusbar.window.StatusBarWindowControllerStore;

import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.surfaceeffects.ripple.RippleShader.RippleShape;

import com.android.systemui.topui.TopUiController;

import com.android.systemui.topui.TopUiControllerRefactor;

import com.android.systemui.util.DumpUtilsKt;

import com.android.systemui.util.WallpaperController;
@@ -1276,7 +1276,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


                        @Override

                        public void hide() {

                            mStatusBarModeRepository.getDefaultDisplay().clearTransient();

                        }

                    });

        }

services/core/java/com/android/server/wm/DisplayContent.java

+1 −0
Original line number Diff line number Diff line
@@ -7119,6 +7119,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        public void setAnimatingTypes(@InsetsType int animatingTypes,

                @Nullable ImeTracker.Token statsToken) {

            if (mAnimatingTypes != animatingTypes) {

                getInsetsPolicy().onAnimatingTypesChanged(this, mAnimatingTypes, animatingTypes);

                mAnimatingTypes = animatingTypes;



                if (android.view.inputmethod.Flags.reportAnimatingInsetsTypes()) {