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

Commit 91f41cea authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed an issue where groups could stay userlocked 

It also fixes an issue where the reinflation wasn't
working properly.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Merged-In: If359256a3ac0c574260b5ff5af3fc2042e1dce9a
Change-Id: If359256a3ac0c574260b5ff5af3fc2042e1dce9a
Fixes: 36469584
parent 605351c5

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

+13 −6
Original line number Diff line number Diff line
@@ -813,11 +813,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 


    public void onDensityOrFontScaleChanged() {

        initDimens();

        if (mIsSummaryWithChildren) {

        // Let's update our childrencontainer. This is intentionally not guarded with

        // mIsSummaryWithChildren since we might have had children but not anymore.

        if (mChildrenContainer != null) {

            mChildrenContainer.reInflateViews(mExpandClickListener, mEntry.notification);

        }

        }

        if (mGuts != null) {

            View oldGuts = mGuts;

            int index = indexOfChild(oldGuts);
@@ -1458,9 +1458,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    public void setUserLocked(boolean userLocked) {

        mUserLocked = userLocked;

        mPrivateLayout.setUserExpanding(userLocked);

        if (mIsSummaryWithChildren) {

        // This is intentionally not guarded with mIsSummaryWithChildren since we might have had

        // children but not anymore.

        if (mChildrenContainer != null) {

            mChildrenContainer.setUserLocked(userLocked);

            if (userLocked || !isGroupExpanded()) {

            if (mIsSummaryWithChildren && (userLocked || !isGroupExpanded())) {

                updateBackgroundForGroupState();

            }

        }
@@ -2189,4 +2191,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            }

        }

    }



    @VisibleForTesting

    protected void setChildrenContainer(NotificationChildrenContainer childrenContainer) {

        mChildrenContainer = childrenContainer;

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.ViewGroup; 
import android.widget.RemoteViews;

import android.widget.TextView;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.R;

import com.android.systemui.statusbar.CrossFadeHelper;

import com.android.systemui.statusbar.ExpandableNotificationRow;
@@ -1223,4 +1224,9 @@ public class NotificationChildrenContainer extends ViewGroup { 
        }

        return getGroupExpandFraction();

    }



    @VisibleForTesting

    public boolean isUserLocked() {

        return mUserLocked;

    }

}

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

+25 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


package com.android.systemui.statusbar;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;



import android.content.Context;

import android.support.test.InstrumentationRegistry;
@@ -25,6 +27,8 @@ import android.support.test.filters.SmallTest; 
import android.support.test.runner.AndroidJUnit4;

import android.view.View;



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



import org.junit.Assert;

import org.junit.Before;

import org.junit.Test;
@@ -62,4 +66,25 @@ public class ExpandableNotificationRowTest { 
                == View.VISIBLE);

    }



    @Test

    public void testUserLockedResetEvenWhenNoChildren() {

        mGroup.setUserLocked(true);

        mGroup.removeAllChildren();

        mGroup.setUserLocked(false);

        Assert.assertFalse("The childrencontainer should not be userlocked but is, the state "

                + "seems out of sync.", mGroup.getChildrenContainer().isUserLocked());

    }



    @Test

    public void testReinflatedOnDensityChange() {

        mGroup.setUserLocked(true);

        mGroup.removeAllChildren();

        mGroup.setUserLocked(false);

        NotificationChildrenContainer mockContainer = mock(NotificationChildrenContainer.class);

        mGroup.setChildrenContainer(mockContainer);

        mGroup.onDensityOrFontScaleChanged();

        verify(mockContainer).reInflateViews(any(), any());

    }





}