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

Commit 0d7e17eb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [9638173, 9638613, 9638413, 9638414, 9638415, 9638614] into qt-qpr1-release 

Change-Id: Iae77574c5c04d7c1f839a05ebe969c76270fdec3
parents fbe49071 b4ba5c91

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.