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

Commit 687e6f13 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the lockscreen height recalculation on face auth." into tm-dev am: 519157a1 

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



Change-Id: I2c337e132c743728010f6481f67827b332bc16ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5694040 519157a1

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -2587,8 +2587,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    }

    }





    public void setSensitive(boolean sensitive, boolean hideSensitive) {

    public void setSensitive(boolean sensitive, boolean hideSensitive) {

        int intrinsicBefore = getIntrinsicHeight();

        mSensitive = sensitive;

        mSensitive = sensitive;

        mSensitiveHiddenInGeneral = hideSensitive;

        mSensitiveHiddenInGeneral = hideSensitive;

        if (intrinsicBefore != getIntrinsicHeight()) {

            // The animation has a few flaws and is highly visible, so jump cut instead.

            notifyHeightChanged(false /* needsAnimation */);

        }

    }

    }





    @Override

    @Override

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -4362,6 +4362,9 @@ public class NotificationPanelViewController extends PanelViewController { 
                    == firstRow))) {

                    == firstRow))) {

                requestScrollerTopPaddingUpdate(false /* animate */);

                requestScrollerTopPaddingUpdate(false /* animate */);

            }

            }

            if (mKeyguardShowing) {

                updateMaxDisplayedNotifications(true);

            }

            requestPanelHeightUpdate();

            requestPanelHeightUpdate();

        }

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java

+99 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ import static com.android.systemui.statusbar.NotificationEntryHelper.modifyRanki 
import static com.android.systemui.statusbar.NotificationEntryHelper.modifySbn;

import static com.android.systemui.statusbar.NotificationEntryHelper.modifySbn;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL;





import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertNull;
@@ -39,10 +41,12 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;





import android.app.Notification;

import android.app.NotificationChannel;

import android.app.NotificationChannel;

import android.testing.AndroidTestingRunner;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;

import android.testing.TestableLooper.RunWithLooper;

import android.util.DisplayMetrics;

import android.view.View;

import android.view.View;





import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;
@@ -53,6 +57,7 @@ import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.notification.AboveShelfChangedListener;

import com.android.systemui.statusbar.notification.AboveShelfChangedListener;

import com.android.systemui.statusbar.notification.FeedbackIcon;

import com.android.systemui.statusbar.notification.FeedbackIcon;

import com.android.systemui.statusbar.notification.row.ExpandableView.OnHeightChangedListener;

import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainer;

import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainer;





import org.junit.Assert;

import org.junit.Assert;
@@ -71,6 +76,8 @@ import java.util.List; 
public class ExpandableNotificationRowTest extends SysuiTestCase {

public class ExpandableNotificationRowTest extends SysuiTestCase {





    private ExpandableNotificationRow mGroupRow;

    private ExpandableNotificationRow mGroupRow;

    private ExpandableNotificationRow mNotifRow;

    private ExpandableNotificationRow mPublicRow;





    private NotificationTestHelper mNotificationTestHelper;

    private NotificationTestHelper mNotificationTestHelper;

    boolean mHeadsUpAnimatingAway = false;

    boolean mHeadsUpAnimatingAway = false;
@@ -84,9 +91,101 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
                mContext,

                mContext,

                mDependency,

                mDependency,

                TestableLooper.get(this));

                TestableLooper.get(this));

        mNotificationTestHelper.setDefaultInflationFlags(FLAG_CONTENT_VIEW_ALL);

        // create a standard private notification row

        Notification normalNotif = mNotificationTestHelper.createNotification();

        normalNotif.publicVersion = null;

        mNotifRow = mNotificationTestHelper.createRow(normalNotif);

        // create a notification row whose public version is identical

        Notification publicNotif = mNotificationTestHelper.createNotification();

        publicNotif.publicVersion = mNotificationTestHelper.createNotification();

        mPublicRow = mNotificationTestHelper.createRow(publicNotif);

        // create a group row

        mGroupRow = mNotificationTestHelper.createGroup();

        mGroupRow = mNotificationTestHelper.createGroup();

        mGroupRow.setHeadsUpAnimatingAwayListener(

        mGroupRow.setHeadsUpAnimatingAwayListener(

                animatingAway -> mHeadsUpAnimatingAway = animatingAway);

                animatingAway -> mHeadsUpAnimatingAway = animatingAway);



    }



    @Test

    public void testSetSensitiveOnNotifRowNotifiesOfHeightChange() throws InterruptedException {

        // GIVEN a sensitive notification row that's currently redacted

        measureAndLayout(mNotifRow);

        mNotifRow.setHideSensitiveForIntrinsicHeight(true);

        mNotifRow.setSensitive(true, true);

        assertThat(mNotifRow.getShowingLayout()).isSameInstanceAs(mNotifRow.getPublicLayout());

        assertThat(mNotifRow.getIntrinsicHeight()).isGreaterThan(0);



        // GIVEN that the row has a height change listener

        OnHeightChangedListener listener = mock(OnHeightChangedListener.class);

        mNotifRow.setOnHeightChangedListener(listener);



        // WHEN the row is set to no longer be sensitive

        mNotifRow.setSensitive(false, true);



        // VERIFY that the height change listener is invoked

        assertThat(mNotifRow.getShowingLayout()).isSameInstanceAs(mNotifRow.getPrivateLayout());

        assertThat(mNotifRow.getIntrinsicHeight()).isGreaterThan(0);

        verify(listener).onHeightChanged(eq(mNotifRow), eq(false));

    }



    @Test

    public void testSetSensitiveOnGroupRowNotifiesOfHeightChange() {

        // GIVEN a sensitive group row that's currently redacted

        measureAndLayout(mGroupRow);

        mGroupRow.setHideSensitiveForIntrinsicHeight(true);

        mGroupRow.setSensitive(true, true);

        assertThat(mGroupRow.getShowingLayout()).isSameInstanceAs(mGroupRow.getPublicLayout());

        assertThat(mGroupRow.getIntrinsicHeight()).isGreaterThan(0);



        // GIVEN that the row has a height change listener

        OnHeightChangedListener listener = mock(OnHeightChangedListener.class);

        mGroupRow.setOnHeightChangedListener(listener);



        // WHEN the row is set to no longer be sensitive

        mGroupRow.setSensitive(false, true);



        // VERIFY that the height change listener is invoked

        assertThat(mGroupRow.getShowingLayout()).isSameInstanceAs(mGroupRow.getPrivateLayout());

        assertThat(mGroupRow.getIntrinsicHeight()).isGreaterThan(0);

        verify(listener).onHeightChanged(eq(mGroupRow), eq(false));

    }



    @Test

    public void testSetSensitiveOnPublicRowDoesNotNotifyOfHeightChange() {

        // GIVEN a sensitive public row that's currently redacted

        measureAndLayout(mPublicRow);

        mPublicRow.setHideSensitiveForIntrinsicHeight(true);

        mPublicRow.setSensitive(true, true);

        assertThat(mPublicRow.getShowingLayout()).isSameInstanceAs(mPublicRow.getPublicLayout());

        assertThat(mPublicRow.getIntrinsicHeight()).isGreaterThan(0);



        // GIVEN that the row has a height change listener

        OnHeightChangedListener listener = mock(OnHeightChangedListener.class);

        mPublicRow.setOnHeightChangedListener(listener);



        // WHEN the row is set to no longer be sensitive

        mPublicRow.setSensitive(false, true);



        // VERIFY that the height change listener is not invoked, because the height didn't change

        assertThat(mPublicRow.getShowingLayout()).isSameInstanceAs(mPublicRow.getPrivateLayout());

        assertThat(mPublicRow.getIntrinsicHeight()).isGreaterThan(0);

        assertThat(mPublicRow.getPrivateLayout().getMinHeight())

                .isEqualTo(mPublicRow.getPublicLayout().getMinHeight());

        verify(listener, never()).onHeightChanged(eq(mPublicRow), eq(false));

    }



    private void measureAndLayout(ExpandableNotificationRow row) {

        DisplayMetrics dm = new DisplayMetrics();

        getContext().getDisplay().getRealMetrics(dm);

        int width = (int) Math.ceil(400f * dm.density);

        int height = (int) Math.ceil(600f * dm.density);



        row.measure(

                View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),

                View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.UNSPECIFIED)

        );

        row.layout(0, 0, row.getMeasuredWidth(), row.getMeasuredHeight());

    }

    }





    @Test

    @Test

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java

+10 −5
Original line number Original line Diff line number Diff line
@@ -124,6 +124,7 @@ public class NotificationTestHelper { 
    private final PeopleNotificationIdentifier mPeopleNotificationIdentifier;

    private final PeopleNotificationIdentifier mPeopleNotificationIdentifier;

    public final OnUserInteractionCallback mOnUserInteractionCallback;

    public final OnUserInteractionCallback mOnUserInteractionCallback;

    public final Runnable mFutureDismissalRunnable;

    public final Runnable mFutureDismissalRunnable;

    private @InflationFlag int mDefaultInflationFlags;





    public NotificationTestHelper(

    public NotificationTestHelper(

            Context context,

            Context context,
@@ -189,6 +190,10 @@ public class NotificationTestHelper { 
                .thenReturn(mFutureDismissalRunnable);

                .thenReturn(mFutureDismissalRunnable);

    }

    }





    public void setDefaultInflationFlags(@InflationFlag int defaultInflationFlags) {

        mDefaultInflationFlags = defaultInflationFlags;

    }



    /**

    /**

     * Creates a generic row.

     * Creates a generic row.

     *

     *
@@ -220,7 +225,7 @@ public class NotificationTestHelper { 
     * @throws Exception

     * @throws Exception

     */

     */

    public ExpandableNotificationRow createRow(Notification notification) throws Exception {

    public ExpandableNotificationRow createRow(Notification notification) throws Exception {

        return generateRow(notification, PKG, UID, USER_HANDLE, 0 /* extraInflationFlags */);

        return generateRow(notification, PKG, UID, USER_HANDLE, mDefaultInflationFlags);

    }

    }





    /**

    /**
@@ -271,7 +276,7 @@ public class NotificationTestHelper { 
                null /* groupKey */, makeBubbleMetadata(null));

                null /* groupKey */, makeBubbleMetadata(null));

        n.flags |= FLAG_BUBBLE;

        n.flags |= FLAG_BUBBLE;

        ExpandableNotificationRow row = generateRow(n, PKG, UID, USER_HANDLE,

        ExpandableNotificationRow row = generateRow(n, PKG, UID, USER_HANDLE,

                0 /* extraInflationFlags */, IMPORTANCE_HIGH);

                mDefaultInflationFlags, IMPORTANCE_HIGH);

        modifyRanking(row.getEntry())

        modifyRanking(row.getEntry())

                .setCanBubble(true)

                .setCanBubble(true)

                .build();

                .build();
@@ -287,7 +292,7 @@ public class NotificationTestHelper { 
                null /* groupKey */, makeShortcutBubbleMetadata(shortcutId));

                null /* groupKey */, makeShortcutBubbleMetadata(shortcutId));

        n.flags |= FLAG_BUBBLE;

        n.flags |= FLAG_BUBBLE;

        ExpandableNotificationRow row = generateRow(n, PKG, UID, USER_HANDLE,

        ExpandableNotificationRow row = generateRow(n, PKG, UID, USER_HANDLE,

                0 /* extraInflationFlags */, IMPORTANCE_HIGH);

                mDefaultInflationFlags, IMPORTANCE_HIGH);

        modifyRanking(row.getEntry())

        modifyRanking(row.getEntry())

                .setCanBubble(true)

                .setCanBubble(true)

                .build();

                .build();
@@ -304,7 +309,7 @@ public class NotificationTestHelper { 
                GROUP_KEY /* groupKey */, makeBubbleMetadata(null));

                GROUP_KEY /* groupKey */, makeBubbleMetadata(null));

        n.flags |= FLAG_BUBBLE;

        n.flags |= FLAG_BUBBLE;

        ExpandableNotificationRow row = generateRow(n, PKG, UID, USER_HANDLE,

        ExpandableNotificationRow row = generateRow(n, PKG, UID, USER_HANDLE,

                0 /* extraInflationFlags */, IMPORTANCE_HIGH);

                mDefaultInflationFlags, IMPORTANCE_HIGH);

        modifyRanking(row.getEntry())

        modifyRanking(row.getEntry())

                .setCanBubble(true)

                .setCanBubble(true)

                .build();

                .build();
@@ -383,7 +388,7 @@ public class NotificationTestHelper { 
            @Nullable String groupKey)

            @Nullable String groupKey)

            throws Exception {

            throws Exception {

        Notification notif = createNotification(isGroupSummary, groupKey);

        Notification notif = createNotification(isGroupSummary, groupKey);

        return generateRow(notif, pkg, uid, userHandle, 0 /* inflationFlags */);

        return generateRow(notif, pkg, uid, userHandle, mDefaultInflationFlags);

    }

    }





    /**

    /**

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java

+35 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.google.common.truth.Truth.assertThat; 




import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyFloat;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.atLeast;
@@ -121,6 +122,8 @@ import com.android.systemui.statusbar.notification.ConversationNotificationManag 
import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.row.ExpandableView;

import com.android.systemui.statusbar.notification.row.ExpandableView.OnHeightChangedListener;

import com.android.systemui.statusbar.notification.stack.AmbientState;

import com.android.systemui.statusbar.notification.stack.AmbientState;

import com.android.systemui.statusbar.notification.stack.NotificationListContainer;

import com.android.systemui.statusbar.notification.stack.NotificationListContainer;

import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager;

import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager;
@@ -567,6 +570,38 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        mMainHandler.removeCallbacksAndMessages(null);

        mMainHandler.removeCallbacksAndMessages(null);

    }

    }





    @Test

    public void onNotificationHeightChangeWhileOnKeyguardWillComputeMaxKeyguardNotifications() {

        mStatusBarStateController.setState(KEYGUARD);

        ArgumentCaptor<OnHeightChangedListener> captor =

                ArgumentCaptor.forClass(OnHeightChangedListener.class);

        verify(mNotificationStackScrollLayoutController)

                .setOnHeightChangedListener(captor.capture());

        OnHeightChangedListener listener = captor.getValue();



        clearInvocations(mNotificationStackSizeCalculator);

        listener.onHeightChanged(mock(ExpandableView.class), false);



        verify(mNotificationStackSizeCalculator)

                .computeMaxKeyguardNotifications(any(), anyFloat(), anyFloat());

    }



    @Test

    public void onNotificationHeightChangeWhileInShadeWillNotComputeMaxKeyguardNotifications() {

        mStatusBarStateController.setState(SHADE);

        ArgumentCaptor<OnHeightChangedListener> captor =

                ArgumentCaptor.forClass(OnHeightChangedListener.class);

        verify(mNotificationStackScrollLayoutController)

                .setOnHeightChangedListener(captor.capture());

        OnHeightChangedListener listener = captor.getValue();



        clearInvocations(mNotificationStackSizeCalculator);

        listener.onHeightChanged(mock(ExpandableView.class), false);



        verify(mNotificationStackSizeCalculator, never())

                .computeMaxKeyguardNotifications(any(), anyFloat(), anyFloat());

    }



    @Test

    @Test

    public void computeMaxKeyguardNotifications_lockscreenToShade_returnsExistingMax() {

    public void computeMaxKeyguardNotifications_lockscreenToShade_returnsExistingMax() {

        when(mAmbientState.getFractionToShade()).thenReturn(0.5f);

        when(mAmbientState.getFractionToShade()).thenReturn(0.5f);