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

Commit fb6f0572 authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge changes I25a79a72,I9ed645cb into main 

* changes:
  Update flag name and disable test
  Correct bug ID on flag
parents d03cfaf7 6d9994c0

packages/SystemUI/aconfig/systemui.aconfig

+9 −9
Original line number Diff line number Diff line
@@ -1846,22 +1846,22 @@ flag { 
}



flag {

    name: "notification_shade_blur"

    namespace: "systemui"

    description: "Enables the new blur effect on the Notification Shade."

    bug: "370555223"

}



flag {

  name: "disable_shade_visible_with_blur"

  name: "disable_blurred_shade_visible"

  namespace: "systemui"

  description: "Removes the check for a blur radius when determining shade window visibility"

  bug: "356804470"

  bug: "394977231"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

    name: "notification_shade_blur"

    namespace: "systemui"

    description: "Enables the new blur effect on the Notification Shade."

    bug: "370555223"

}



flag {

    name: "notification_row_transparency"

    namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.app.IActivityManager; 
import android.content.pm.ActivityInfo;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.flag.junit.FlagsParameterization;

import android.testing.TestableLooper.RunWithLooper;

import android.view.View;
@@ -49,6 +50,7 @@ import androidx.test.filters.SmallTest; 


import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.colorextraction.ColorExtractor;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.biometrics.AuthController;

import com.android.systemui.colorextraction.SysuiColorExtractor;
@@ -265,6 +267,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_DISABLE_BLURRED_SHADE_VISIBLE)

    public void setBackgroundBlurRadius_expandedWithBlurs() {

        mNotificationShadeWindowController.setBackgroundBlurRadius(10);

        verify(mNotificationShadeWindowView).setVisibility(eq(View.VISIBLE));

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    }



    private boolean isExpanded(NotificationShadeWindowState state) {

        boolean visForBlur = !Flags.disableShadeVisibleWithBlur() && state.backgroundBlurRadius > 0;

        boolean visForBlur = !Flags.disableBlurredShadeVisible() && state.backgroundBlurRadius > 0;

        boolean isExpanded = !state.forceWindowCollapsed && (state.isKeyguardShowingAndNotOccluded()

                || state.panelVisible || state.keyguardFadingAway || state.bouncerShowing

                || state.headsUpNotificationShowing