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

Commit 30bd0d07 authored by Tony Wickham's avatar Tony Wickham
Browse files

Fix nav bar icon tinting not working in SUW

Bug: 308798376
Test: Go through setup wizard on tablet, back button is dark on
light instead of light on light.
Flag: None

Change-Id: I3f5cf85162ec28f24ea20916c8f246ff0581ddbb
parent 05e37a0a
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.util.MathUtils;
import android.util.TimeUtils;

import com.android.app.animation.Interpolators;
import com.android.internal.policy.GestureNavigationSettingsObserver;
import com.android.systemui.Dumpable;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.shared.system.QuickStepContract;
@@ -95,6 +96,7 @@ public class LightBarTransitionsController implements Dumpable {
    private final KeyguardStateController mKeyguardStateController;
    private final StatusBarStateController mStatusBarStateController;
    private final CommandQueue mCommandQueue;
    private final GestureNavigationSettingsObserver mGestureNavigationSettingsObserver;

    private boolean mTransitionDeferring;
    private long mTransitionDeferringStartTime;
@@ -134,6 +136,8 @@ public class LightBarTransitionsController implements Dumpable {
        mDozeAmount = mStatusBarStateController.getDozeAmount();
        mContext = context;
        mDisplayId = mContext.getDisplayId();
        mGestureNavigationSettingsObserver = new GestureNavigationSettingsObserver(
                mHandler, mContext, null);
    }

    /** Call to cleanup the LightBarTransitionsController when done with it. */
@@ -279,7 +283,8 @@ public class LightBarTransitionsController implements Dumpable {
     */
    public boolean supportsIconTintForNavMode(int navigationMode) {
        // In gesture mode, we already do region sampling to update tint based on content beneath.
        return !QuickStepContract.isGesturalMode(navigationMode);
        return !QuickStepContract.isGesturalMode(navigationMode)
                || mGestureNavigationSettingsObserver.areNavigationButtonForcedVisible();
    }

    /**