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

Commit dbcecaeb authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Fix nav bar icon tinting not working in SUW" into main

parents 94c9ad8c 02e3b412

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.util.MathUtils; 
import android.util.TimeUtils;

import android.util.TimeUtils;





import com.android.app.animation.Interpolators;

import com.android.app.animation.Interpolators;

import com.android.internal.policy.GestureNavigationSettingsObserver;

import com.android.systemui.Dumpable;

import com.android.systemui.Dumpable;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.shared.system.QuickStepContract;
@@ -95,6 +96,7 @@ public class LightBarTransitionsController implements Dumpable { 
    private final KeyguardStateController mKeyguardStateController;

    private final KeyguardStateController mKeyguardStateController;

    private final StatusBarStateController mStatusBarStateController;

    private final StatusBarStateController mStatusBarStateController;

    private final CommandQueue mCommandQueue;

    private final CommandQueue mCommandQueue;

    private final GestureNavigationSettingsObserver mGestureNavigationSettingsObserver;





    private boolean mTransitionDeferring;

    private boolean mTransitionDeferring;

    private long mTransitionDeferringStartTime;

    private long mTransitionDeferringStartTime;
@@ -134,6 +136,8 @@ public class LightBarTransitionsController implements Dumpable { 
        mDozeAmount = mStatusBarStateController.getDozeAmount();

        mDozeAmount = mStatusBarStateController.getDozeAmount();

        mContext = context;

        mContext = context;

        mDisplayId = mContext.getDisplayId();

        mDisplayId = mContext.getDisplayId();

        mGestureNavigationSettingsObserver = new GestureNavigationSettingsObserver(

                mHandler, mContext, null);

    }

    }





    /** Call to cleanup the LightBarTransitionsController when done with it. */

    /** Call to cleanup the LightBarTransitionsController when done with it. */
@@ -279,7 +283,8 @@ public class LightBarTransitionsController implements Dumpable { 
     */

     */

    public boolean supportsIconTintForNavMode(int navigationMode) {

    public boolean supportsIconTintForNavMode(int navigationMode) {

        // In gesture mode, we already do region sampling to update tint based on content beneath.

        // 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();

    }

    }





    /**

    /**