From ebeed0239bcec205368c168b548fa9c93af56826 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 14 May 2019 16:22:57 -0700 Subject: [PATCH] Disable auto dimming when color sampling is enabled Bug: 132371142 Test: Manual, launch app/rotate and ensure that the handle does not dim Change-Id: I2616dd81b8453e7d8fb196273499db373a10fa93 --- .../systemui/statusbar/phone/NavigationBarTransitions.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java index 9e0aff0703647..3b3336b3f14d7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java @@ -107,6 +107,8 @@ public final class NavigationBarTransitions extends BarTransitions implements @Override public void setAutoDim(boolean autoDim) { + // Ensure we aren't in gestural nav if we are triggering auto dim + if (autoDim && NavBarTintController.isEnabled(mView.getContext(), mNavBarMode)) return; if (mAutoDim == autoDim) return; mAutoDim = autoDim; applyLightsOut(true, false);