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

Unverified Commit 80906861 authored by Selim Cinek's avatar Selim Cinek Committed by Arian
Browse files

DO NOT MERGE Revert all scrim related changes in qpr 

This reverts commit cf81ce27.
This reverts commit 22fa9757.
This reverts commit bde48202.

Bug: 141649119
Bug: 143195895 is also fixed on my taimen with the above.
Bug: 143185828
Test: atest SystemUITests
Change-Id: I225b10fef2f88d3436ef3a683c09717467b071ad
(cherry picked from commit f97d7f73)
parent 96f3897f

packages/SystemUI/res/layout/super_status_bar.xml

+1 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
    </com.android.systemui.statusbar.BackDropView>



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_for_bubble"

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"
@@ -56,14 +56,6 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

        />



    <include layout="@layout/status_bar_expanded"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+1 −2
Original line number Diff line number Diff line
@@ -123,12 +123,11 @@ public class SystemUIFactory { 
    }



    public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,

            ScrimView scrimForBubble,

            LockscreenWallpaper lockscreenWallpaper,

            TriConsumer<ScrimState, Float, GradientColors> scrimStateListener,

            Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,

            AlarmManager alarmManager, KeyguardMonitor keyguardMonitor) {

        return new ScrimController(scrimBehind, scrimInFront, scrimForBubble, scrimStateListener,

        return new ScrimController(scrimBehind, scrimInFront, scrimStateListener,

                scrimVisibleListener, dozeParameters, alarmManager, keyguardMonitor);

    }

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+4 −3
Original line number Diff line number Diff line
@@ -316,9 +316,10 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        if (mStackView == null) {

            mStackView = new BubbleStackView(mContext, mBubbleData, mSurfaceSynchronizer);

            ViewGroup sbv = mStatusBarWindowController.getStatusBarView();

            int bubbleScrimIndex = sbv.indexOfChild(sbv.findViewById(R.id.scrim_for_bubble));

            int stackIndex = bubbleScrimIndex + 1;  // Show stack above bubble scrim.

            sbv.addView(mStackView, stackIndex,

            // TODO(b/130237686): When you expand the shade on top of expanded bubble, there is no

            //  scrim between bubble and the shade

            int bubblePosition = sbv.indexOfChild(sbv.findViewById(R.id.scrim_behind)) + 1;

            sbv.addView(mStackView, bubblePosition,

                    new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));

            if (mExpandListener != null) {

                mStackView.setExpandListener(mExpandListener);

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

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
     */

    public void onScrimVisibilityChanged(@ScrimVisibility int scrimsVisible) {

        if (mWakeAndUnlockRunning

                && scrimsVisible == ScrimController.TRANSPARENT) {

                && scrimsVisible == ScrimController.VISIBILITY_FULLY_TRANSPARENT) {

            mWakeAndUnlockRunning = false;

            update();

        }

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

+88 −149

File changed.

Preview size limit exceeded, changes collapsed.