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

Commit 249534a3 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊 Committed by Nishith Khanna
Browse files

fix light mode 3 button navigation

parent 0343b8b6
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.systemui.shared.statusbar.phone.BarTransitions.MODE_LI
import static com.android.systemui.shared.statusbar.phone.BarTransitions.MODE_TRANSPARENT;

import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.util.Log;
import android.view.Display;
@@ -137,8 +138,11 @@ public class LightBarControllerImpl implements
    private final NavigationModeController.ModeChangedListener mNavigationModeListener =
            (mode) -> mNavigationMode = mode;

    private Context mContext;

    @AssistedInject
    public LightBarControllerImpl(
            Context ctx,
            @Assisted int displayId,
            @Assisted CoroutineScope coroutineScope,
            @Assisted DarkIconDispatcher darkIconDispatcher,
@@ -148,6 +152,7 @@ public class LightBarControllerImpl implements
            DumpManager dumpManager,
            @Main CoroutineContext mainContext,
            BiometricUnlockController biometricUnlockController) {
        mContext = ctx;
        mDisplayId = displayId;
        mCoroutineScope = coroutineScope;
        mStatusBarIconController = (SysuiDarkIconDispatcher) darkIconDispatcher;
@@ -245,7 +250,7 @@ public class LightBarControllerImpl implements
            final boolean ignoreScrimForce = mDirectReplying && mNavbarColorManagedByIme;
            final boolean darkForScrim = mForceDarkForScrim && !ignoreScrimForce;
            final boolean lightForScrim = mForceLightForScrim && !ignoreScrimForce;
            final boolean darkForQs = (mQsCustomizing || mQsExpanded) && !mBouncerVisible;
            final boolean darkForQs = isNightMode() && (!mQsCustomizing && !mQsExpanded) && mBouncerVisible;
            final boolean darkForTop = darkForQs || mGlobalActionsVisible;
            mNavigationLight =
                    ((mHasLightNavigationBar && !darkForScrim) || lightForScrim) && !darkForTop;
@@ -277,6 +282,11 @@ public class LightBarControllerImpl implements
        mNavbarColorManagedByIme = navbarColorManagedByIme;
    }

    private boolean isNightMode() {
        return (mContext.getResources().getConfiguration().uiMode
                & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
    }
    
    @Override
    public void onNavigationBarModeChanged(int newBarMode) {
        mHasLightNavigationBar = isLight(mAppearance, newBarMode, APPEARANCE_LIGHT_NAVIGATION_BARS);