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
public void onDensityOrFontScaleChanged() {
initDimens();
- if (mIsSummaryWithChildren) {
- if (mChildrenContainer != null) {
- mChildrenContainer.reInflateViews(mExpandClickListener, mEntry.notification);
- }
+ // 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;
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();
}
}
}
}
}
+
+ @VisibleForTesting
+ protected void setChildrenContainer(NotificationChildrenContainer childrenContainer) {
+ mChildrenContainer = childrenContainer;
+ }
}
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;
}
return getGroupExpandFraction();
}
+
+ @VisibleForTesting
+ public boolean isUserLocked() {
+ return mUserLocked;
+ }
}
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;
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;
== 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());
+ }
+
+
}