From 5e8e1c63774da8c013fad18a63eac691cdc9646f Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Fri, 4 Sep 2015 11:51:26 -0700
Subject: [PATCH] Do not expand notifications with expand gesture when
 disallowed

Bug: 23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
---
 packages/SystemUI/src/com/android/systemui/ExpandHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
index b0e2afae1bcb..1dca14928c6d 100644
--- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
@@ -112,7 +112,9 @@ public class ExpandHelper implements Gefingerpoken {
         public boolean onScaleBegin(ScaleGestureDetector detector) {
             if (DEBUG_SCALE) Log.v(TAG, "onscalebegin()");
 
-            startExpanding(mResizedView, STRETCH);
+            if (!mOnlyMovements) {
+                startExpanding(mResizedView, STRETCH);
+            }
             return mExpanding;
         }
 
-- 
2.11.0