commit cf39c8de0164b5082fb6703376c390a354c559fb
author Jason Monk <jmonk@google.com> Tue Mar 08 21:48:34 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 08 21:48:35 2016 +0000
tree ceadeb758ba1b84386cba2e5ca8826ea85590089
parent 37b3a4a5440f489f65941b8182b33c34f86ffc1d
parent 39a2e70d7e5dbe58bb1787e2cab2199c34f0c87c

Merge "Flip the default on whether to keep rows together" into nyc-dev

packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
index fcc7b24..c8c71cb 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -107,7 +107,7 @@
                 clearAnimationState();
             }
         } else if (MOVE_FULL_ROWS.equals(key)) {
-            mFullRows = newValue != null && Integer.parseInt(newValue) != 0;
+            mFullRows = newValue == null || Integer.parseInt(newValue) != 0;
         } else if (QuickQSPanel.NUM_QUICK_TILES.equals(key)) {
             mNumQuickTiles = QuickQSPanel.getNumQuickTiles(mQsContainer.getContext());
             clearAnimationState();