commit 6bcf0cdf37cb13aebfaf17b757401d025a4a35e1
author Annie Chin <afchin@google.com> Thu Aug 04 22:08:15 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 04 22:08:16 2016 +0000
tree 16d76acf2b7b583ed2077e7e6a0405f3185bf57f
parent 2f917df4be5963bc30f2f684208c9aa4177353cc
parent 399ddb02041d66b42cabba8ebbf2a9690195cf5b

Merge "setCarMode() only when car mode changes" into nyc-mr1-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 0f4d9ed..1a6dd12 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -620,11 +620,12 @@
             if (mCarMode && uiMode != Configuration.UI_MODE_TYPE_CAR) {
                 mCarMode = false;
                 uiCarModeChanged = true;
+                getHomeButton().setCarMode(mCarMode);
             } else if (uiMode == Configuration.UI_MODE_TYPE_CAR) {
                 mCarMode = true;
                 uiCarModeChanged = true;
+                getHomeButton().setCarMode(mCarMode);
             }
-            getHomeButton().setCarMode(mCarMode);
         }
         return uiCarModeChanged;
     }