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

Commit dbe3811e authored by Selim Cinek's avatar Selim Cinek Committed by Automerger Merge Worker
Browse files

Merge "Fading out keyguard only content instead of occluding them with the... 

Merge "Fading out keyguard only content instead of occluding them with the scrim" into sc-dev am: 0e7b5cc8 am: 259c3ea9

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

Change-Id: I2232f6433322052bc9f909aee49778db65a52ac4
parents af044c28 259c3ea9

packages/SystemUI/res/layout/status_bar_expanded.xml

+0 −12
Original line number Original line Diff line number Diff line
@@ -64,18 +64,6 @@ 
        android:clipToPadding="false"

        android:clipToPadding="false"

        android:clipChildren="false">

        android:clipChildren="false">





        <com.android.systemui.scrim.ScrimView

            android:id="@+id/scrim_notifications"

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:importantForAccessibility="no"

            systemui:ignoreRightInset="true"

            systemui:layout_constraintStart_toStartOf="parent"

            systemui:layout_constraintEnd_toEndOf="parent"

            systemui:layout_constraintTop_toTopOf="parent"

            systemui:layout_constraintBottom_toBottomOf="parent"

        />



        <include

        <include

            layout="@layout/keyguard_status_view"

            layout="@layout/keyguard_status_view"

            android:visibility="gone"/>

            android:visibility="gone"/>

packages/SystemUI/res/layout/super_notification_shade.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,14 @@ 
        sysui:ignoreRightInset="true"

        sysui:ignoreRightInset="true"

        />

        />





    <com.android.systemui.scrim.ScrimView

        android:id="@+id/scrim_notifications"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

        />



    <com.android.systemui.statusbar.LightRevealScrim

    <com.android.systemui.statusbar.LightRevealScrim

            android:id="@+id/light_reveal_scrim"

            android:id="@+id/light_reveal_scrim"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

packages/SystemUI/src/com/android/keyguard/LockIconView.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,11 @@ public class LockIconView extends ImageView { 
        updateSensorRect(h, w);

        updateSensorRect(h, w);

    }

    }





    @Override

    public boolean hasOverlappingRendering() {

        return false;

    }



    float getLocationTop() {

    float getLocationTop() {

        return mLockIconCenter.y - mRadius;

        return mLockIconCenter.y - mRadius;

    }

    }

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -451,4 +451,11 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 




    private final AccessibilityManager.TouchExplorationStateChangeListener

    private final AccessibilityManager.TouchExplorationStateChangeListener

            mTouchExplorationStateChangeListener = enabled -> updateClickListener();

            mTouchExplorationStateChangeListener = enabled -> updateClickListener();



    /**

     * Set the alpha of this view.

     */

    public void setAlpha(float alpha) {

        mView.setAlpha(alpha);

    }

}
 
}

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+2 −0
Original line number Original line Diff line number Diff line
@@ -287,6 +287,8 @@ class LockscreenShadeTransitionController @Inject constructor( 
                    // TODO: appear media also in split shade

                    // TODO: appear media also in split shade

                    val mediaAmount = if (useSplitShade) 0f else field

                    val mediaAmount = if (useSplitShade) 0f else field

                    mediaHierarchyManager.setTransitionToFullShadeAmount(mediaAmount)

                    mediaHierarchyManager.setTransitionToFullShadeAmount(mediaAmount)

                    // Fade out all content only visible on the lockscreen

                    notificationPanelController.setKeyguardOnlyContentAlpha(1.0f - scrimProgress)

                }

                }

            }

            }

        }

        }