diff --git a/packages/SystemUI/res/drawable/qs_background_primary.xml b/packages/SystemUI/res/drawable/qs_background_primary.xml deleted file mode 100644 index 30d026ec2948e..0000000000000 --- a/packages/SystemUI/res/drawable/qs_background_primary.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml index 30e52e9a763ca..b2be54b59561d 100644 --- a/packages/SystemUI/res/layout/qs_panel.xml +++ b/packages/SystemUI/res/layout/qs_panel.xml @@ -21,13 +21,6 @@ android:clipToPadding="false" android:clipChildren="false" > - - - false true - true false diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java index 661dbf60bb3b5..726555034ea6f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java @@ -60,7 +60,7 @@ public class QSContainerImpl extends FrameLayout { private int mFancyClippingBottom; private final float[] mFancyClippingRadii = new float[] {0, 0, 0, 0, 0, 0, 0, 0}; private final Path mFancyClippingPath = new Path(); - private int mBackgroundBottom = -1; + private int mBackgroundBottom = 0; private int mHeightOverride = -1; private View mQSDetail; private QuickStatusBarHeader mHeader; @@ -68,11 +68,8 @@ public class QSContainerImpl extends FrameLayout { private QSCustomizer mQSCustomizer; private NonInterceptingScrollView mQSPanelContainer; - private View mBackground; - private int mSideMargins; private boolean mQsDisabled; - private boolean mBackgroundVisible; private int mContentPadding = -1; private boolean mAnimateBottomOnNextLayout; private int mNavBarInset = 0; @@ -89,7 +86,6 @@ public class QSContainerImpl extends FrameLayout { mQSDetail = findViewById(R.id.qs_detail); mHeader = findViewById(R.id.header); mQSCustomizer = findViewById(R.id.qs_customize); - mBackground = findViewById(R.id.quick_settings_background); mHeader.getHeaderQsPanel().setMediaVisibilityChangedListener((visible) -> { if (mHeader.getHeaderQsPanel().isShown()) { mAnimateBottomOnNextLayout = true; @@ -111,13 +107,9 @@ public class QSContainerImpl extends FrameLayout { // We're saving the bottom separately since otherwise the bottom would be overridden in // the layout and the animation wouldn't properly start at the old position. mBackgroundBottom = value; - mBackground.setBottom(value); } private float getBackgroundBottom() { - if (mBackgroundBottom == -1) { - return mBackground.getBottom(); - } return mBackgroundBottom; } @@ -134,14 +126,6 @@ public class QSContainerImpl extends FrameLayout { return true; } - /** - * If QS should have a solid or transparent background. - */ - public void setBackgroundVisible(boolean visible) { - mBackgroundVisible = visible; - updateBackgroundVisibility(); - } - @Override public WindowInsets onApplyWindowInsets(WindowInsets insets) { mNavBarInset = insets.getInsets(WindowInsets.Type.navigationBars()).bottom; @@ -208,11 +192,6 @@ public class QSContainerImpl extends FrameLayout { final boolean disabled = (state2 & DISABLE2_QUICK_SETTINGS) != 0; if (disabled == mQsDisabled) return; mQsDisabled = disabled; - updateBackgroundVisibility(); - } - - private void updateBackgroundVisibility() { - mBackground.setVisibility(mQsDisabled || !mBackgroundVisible ? GONE : VISIBLE); } void updateResources(QSPanelController qsPanelController, @@ -260,7 +239,6 @@ public class QSContainerImpl extends FrameLayout { mQSDetail.setBottom(getTop() + scrollBottom); int qsDetailBottomMargin = ((MarginLayoutParams) mQSDetail.getLayoutParams()).bottomMargin; mQSDetail.setBottom(getTop() + scrollBottom - qsDetailBottomMargin); - mBackground.setTop(mQSPanelContainer.getTop()); updateBackgroundBottom(scrollBottom, animate); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index d5cb777416a73..73982fb1cb02f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -172,7 +172,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca mQSContainerImplController = qsFragmentComponent.getQSContainerImplController(); mQSContainerImplController.init(); mContainer = mQSContainerImplController.getView(); - mContainer.setBackgroundVisible(!mFeatureFlags.isShadeOpaque()); mQSDetail.setQsPanel(mQSPanelController, mHeader, mFooter); mQSAnimator = qsFragmentComponent.getQSAnimator(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java b/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java index 17b489ca24909..d96e1ba22ecc6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java @@ -44,10 +44,6 @@ public class FeatureFlags { return mFlagReader.isEnabled(R.bool.flag_notification_pipeline2_rendering); } - public boolean isShadeOpaque() { - return mFlagReader.isEnabled(R.bool.flag_shade_is_opaque); - } - /** b/171917882 */ public boolean isTwoColumnNotificationShadeEnabled() { return mFlagReader.isEnabled(R.bool.flag_notification_twocolumn); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 6fb18d41e84bc..c09293115492c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -49,7 +49,6 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dock.DockManager; import com.android.systemui.scrim.ScrimView; -import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.notification.stack.ViewState; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -211,10 +210,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump AlarmManager alarmManager, KeyguardStateController keyguardStateController, DelayedWakeLock.Builder delayedWakeLockBuilder, Handler handler, KeyguardUpdateMonitor keyguardUpdateMonitor, DockManager dockManager, - ConfigurationController configurationController, - FeatureFlags featureFlags, @Main Executor mainExecutor) { + ConfigurationController configurationController, @Main Executor mainExecutor) { mScrimStateListener = lightBarController::setScrimState; - mDefaultScrimAlpha = featureFlags.isShadeOpaque() ? BUSY_SCRIM_ALPHA : GAR_SCRIM_ALPHA; + mDefaultScrimAlpha = BUSY_SCRIM_ALPHA; ScrimState.BUBBLE_EXPANDED.setBubbleAlpha(BUBBLE_SCRIM_ALPHA); mKeyguardStateController = keyguardStateController; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java index 7dcfc6b9ebf79..b6eb4923ee4ab 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java @@ -50,7 +50,6 @@ import com.android.systemui.DejankUtils; import com.android.systemui.SysuiTestCase; import com.android.systemui.dock.DockManager; import com.android.systemui.scrim.ScrimView; -import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.ConfigurationController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.concurrency.FakeExecutor; @@ -107,8 +106,6 @@ public class ScrimControllerTest extends SysuiTestCase { private DockManager mDockManager; @Mock private ConfigurationController mConfigurationController; - @Mock - private FeatureFlags mFeatureFlags; private static class AnimatorListener implements Animator.AnimatorListener { @@ -217,14 +214,12 @@ public class ScrimControllerTest extends SysuiTestCase { when(mDelayedWakeLockBuilder.setTag(any(String.class))) .thenReturn(mDelayedWakeLockBuilder); when(mDelayedWakeLockBuilder.build()).thenReturn(mWakeLock); - when(mFeatureFlags.isShadeOpaque()).thenReturn(true); when(mDockManager.isDocked()).thenReturn(false); mScrimController = new ScrimController(mLightBarController, mDozeParameters, mAlarmManager, mKeyguardStateController, mDelayedWakeLockBuilder, new FakeHandler(mLooper.getLooper()), mKeyguardUpdateMonitor, - mDockManager, mConfigurationController, mFeatureFlags, - new FakeExecutor(new FakeSystemClock())); + mDockManager, mConfigurationController, new FakeExecutor(new FakeSystemClock())); mScrimController.setScrimVisibleListener(visible -> mScrimVisibility = visible); mScrimController.attachViews(mScrimBehind, mNotificationsScrim, mScrimInFront, mScrimForBubble);