summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-09-04 11:51:26 -0700
committerJorim Jaggi <jjaggi@google.com>2015-09-08 18:51:00 +0000
commit5e8e1c63774da8c013fad18a63eac691cdc9646f (patch)
tree805f19ab3ab5cba468dc1f9beb95706e520b0afd /packages/SystemUI/src/com/android/systemui/ExpandHelper.java
parent9f3e169c3a6277187fe00abc2eaa08d5872160ef (diff)
downloadframeworks_base-5e8e1c63774da8c013fad18a63eac691cdc9646f.zip
frameworks_base-5e8e1c63774da8c013fad18a63eac691cdc9646f.tar.gz
frameworks_base-5e8e1c63774da8c013fad18a63eac691cdc9646f.tar.bz2
Do not expand notifications with expand gesture when disallowed
Bug: 23596083 Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/ExpandHelper.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/ExpandHelper.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
index b0e2afa..1dca149 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;
}