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

Commit 1533496b authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "2/N The road to Material NEXT (qs scrim)"

parents 485e78b4 37658e2b

packages/SystemUI/res/drawable/qs_navbar_scrim.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2014 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <gradient

            android:type="linear"

            android:angle="90"

            android:startColor="#55000000"

            android:endColor="#00000000" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+0 −8
Original line number Diff line number Diff line
@@ -92,13 +92,5 @@ 
        layout="@layout/keyguard_bottom_area"

        android:visibility="gone" />



    <com.android.systemui.statusbar.AlphaOptimizedView

        android:id="@+id/qs_navbar_scrim"

        android:layout_height="96dp"

        android:layout_width="match_parent"

        android:layout_gravity="bottom"

        android:visibility="invisible"

        android:background="@drawable/qs_navbar_scrim" />



    <include layout="@layout/status_bar_expanded_plugin_frame"/>

</com.android.systemui.statusbar.phone.NotificationPanelView>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+0 −9
Original line number Diff line number Diff line
@@ -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());