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

Commit a173a507 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Revert^2 "SystemUI: Remove nav bar background in QS customizer" 

This reverts commit 870ecaf7.

Change-Id: Icd1fd00daeabd8820da61063f14745e54b2542c8
parent 48054b43

packages/SystemUI/res/layout/qs_customize_panel_content.xml

+0 −6
Original line number Original line Diff line number Diff line
@@ -57,10 +57,4 @@ 
            android:importantForAccessibility="auto" />

            android:importantForAccessibility="auto" />

    </com.android.keyguard.AlphaOptimizedLinearLayout>

    </com.android.keyguard.AlphaOptimizedLinearLayout>





    <View

        android:id="@+id/nav_bar_background"

        android:layout_width="match_parent"

        android:layout_height="@dimen/navigation_bar_size"

        android:layout_gravity="bottom"

        android:background="#ff000000" />

</merge>
 
</merge>

packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java

+0 −11
Original line number Original line Diff line number Diff line
@@ -106,12 +106,6 @@ public class QSCustomizer extends LinearLayout { 
        if (enabled != mSceneContainerEnabled) {

        if (enabled != mSceneContainerEnabled) {

            mSceneContainerEnabled = enabled;

            mSceneContainerEnabled = enabled;

            updateTransparentViewHeight();

            updateTransparentViewHeight();

            if (mSceneContainerEnabled) {

                findViewById(R.id.nav_bar_background).setVisibility(View.GONE);

            } else {

                findViewById(R.id.nav_bar_background)

                        .setVisibility(mIsShowingNavBackdrop ? View.VISIBLE : View.GONE);

            }

        }

        }

    }

    }
@@ -121,13 +115,8 @@ public class QSCustomizer extends LinearLayout { 
    }

    }





    void updateNavBackDrop(Configuration newConfig, LightBarController lightBarController) {

    void updateNavBackDrop(Configuration newConfig, LightBarController lightBarController) {

        View navBackdrop = findViewById(R.id.nav_bar_background);

        mIsShowingNavBackdrop = newConfig.smallestScreenWidthDp >= 600

        mIsShowingNavBackdrop = newConfig.smallestScreenWidthDp >= 600

                || newConfig.orientation != Configuration.ORIENTATION_LANDSCAPE;

                || newConfig.orientation != Configuration.ORIENTATION_LANDSCAPE;

        if (navBackdrop != null) {

            navBackdrop.setVisibility(

                    mIsShowingNavBackdrop && !mSceneContainerEnabled ? View.VISIBLE : View.GONE);

        }

        updateNavColors(lightBarController);

        updateNavColors(lightBarController);

    }

    }