diff --git a/packages/SystemUI/res/drawable/qs_navbar_scrim.xml b/packages/SystemUI/res/drawable/qs_navbar_scrim.xml deleted file mode 100644 index bbb2617db4a02..0000000000000 --- a/packages/SystemUI/res/drawable/qs_navbar_scrim.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 1d4b98242519b..75f76b431da8a 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -92,13 +92,5 @@ layout="@layout/keyguard_bottom_area" android:visibility="gone" /> - - diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index c67e8fd4f89c9..99818baef3e35 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -304,7 +304,6 @@ public class NotificationPanelViewController extends PanelViewController { private FrameLayout mQsFrame; private KeyguardStatusViewController mKeyguardStatusViewController; private DisabledUdfpsController mDisabledUdfpsController; - private View mQsNavbarScrim; private NotificationsQuickSettingsContainer mNotificationContainerParent; private boolean mAnimateNextPositionUpdate; @@ -650,7 +649,6 @@ public class NotificationPanelViewController extends PanelViewController { mOnEmptySpaceClickListener); addTrackingHeadsUpListener(mNotificationStackScrollLayoutController::setTrackingHeadsUp); mKeyguardBottomArea = mView.findViewById(R.id.keyguard_bottom_area); - mQsNavbarScrim = mView.findViewById(R.id.qs_navbar_scrim); mLastOrientation = mResources.getConfiguration().orientation; initBottomArea(); @@ -1730,9 +1728,6 @@ public class NotificationPanelViewController extends PanelViewController { mBarState != KEYGUARD && (!mQsExpanded || mQsExpansionFromOverscroll)); - mQsNavbarScrim.setVisibility( - mBarState == StatusBarState.SHADE && mQsExpanded && !mStackScrollerOverscrolling - && mQsScrimEnabled ? View.VISIBLE : View.INVISIBLE); if (mKeyguardUserSwitcher != null && mQsExpanded && !mStackScrollerOverscrolling) { mKeyguardUserSwitcher.hideIfNotSimple(true /* animate */); } @@ -1757,10 +1752,6 @@ public class NotificationPanelViewController extends PanelViewController { updateKeyguardBottomAreaAlpha(); updateBigClockAlpha(); } - if (mBarState == StatusBarState.SHADE && mQsExpanded && !mStackScrollerOverscrolling - && mQsScrimEnabled) { - mQsNavbarScrim.setAlpha(getQsExpansionFraction()); - } if (mAccessibilityManager.isEnabled()) { mView.setAccessibilityPaneTitle(determineAccessibilityPaneTitle());