| commit | 508933c7c54df94346b0f9f3cdb087d5556a3ebc | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Wed May 15 13:47:07 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 15 13:47:07 2019 -0700 |
| tree | 2e7891f92577e3647865171d1b4c48e4697d661b | |
| parent | ebcdb0881bc07cea657d1979d27620af190461bb [diff] | |
| parent | 28706f020b3bb4e93703e3405c03dc459fe1a04b [diff] |
Merge "Disable auto dimming when color sampling is enabled" into qt-dev am: 28706f020b Change-Id: Ibc07ee44c30b76e2ddf1aa4b1f7bef07a3a39ae3
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 9e0aff0..3b3336b 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 @@ @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);