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

Commit 845fed6a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Always use light reveal scrim" into sc-qpr1-dev am: d31ee841 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15664575

Change-Id: I79ed248a1d5de8df3efc74bf64ebf6f59132d3e4
parents 2d9d1920 d31ee841

packages/SystemUI/res/layout/super_notification_shade.xml

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ 
    <com.android.systemui.statusbar.LightRevealScrim

            android:id="@+id/light_reveal_scrim"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:visibility="gone" />

            android:layout_height="match_parent" />



    <include layout="@layout/status_bar_expanded"

        android:layout_width="match_parent"

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

+1 −7
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                mNotificationShadeWindowViewController,

                mNotificationPanelViewController,

                mAmbientIndicationContainer);

        mDozeParameters.addCallback(this::updateLightRevealScrimVisibility);

        updateLightRevealScrimVisibility();



        mConfigurationController.addCallback(this);
@@ -4956,11 +4956,5 @@ public class StatusBar extends SystemUI implements DemoMode, 
        }



        mLightRevealScrim.setAlpha(mScrimController.getState().getMaxLightRevealScrimAlpha());

        if (mFeatureFlags.useNewLockscreenAnimations()

                && (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {

            mLightRevealScrim.setVisibility(View.VISIBLE);

        } else {

            mLightRevealScrim.setVisibility(View.GONE);

        }

    }

}