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

Commit 2da5f73e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28434270',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28434270', 'googleplex-android-review.googlesource.com/28548866'] into 24Q3-release.

Change-Id: I460856c9e2e971d9881c4af50cdd1d3888f849c6
parents 6ca8fcb8 c93b85ce

core/java/com/android/internal/policy/PhoneWindow.java

+3 −0
Original line number Diff line number Diff line
@@ -2501,6 +2501,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        if (mEdgeToEdgeEnforced) {

            getAttributes().privateFlags |= PRIVATE_FLAG_EDGE_TO_EDGE_ENFORCED;

            mDecorFitsSystemWindows = false;

            mStatusBarColor = Color.TRANSPARENT;

            mNavigationBarDividerColor = Color.TRANSPARENT;

            // mNavigationBarColor is not reset here because it might be used to draw the scrim.

        }

        if (CompatChanges.isChangeEnabled(OVERRIDE_LAYOUT_IN_DISPLAY_CUTOUT_MODE)

                && !a.getBoolean(R.styleable.Window_windowOptOutEdgeToEdgeEnforcement,

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ object DeviceEntryIconViewBinder { 
                launch("$TAG#viewModel.isVisible") {

                    viewModel.isVisible.collect { isVisible ->

                        longPressHandlingView.isInvisible = !isVisible

                        view.isClickable = isVisible

                    }

                }

                launch("$TAG#viewModel.isLongPressEnabled") {