commit | 2a88fc31cf16b419fdd23c9841ffdbfe7af9d966 | [log] [tgz] |
---|---|---|
author | Chong Zhang <chz@google.com> | Mon Jan 11 17:14:24 2016 -0800 |
committer | Chong Zhang <chz@google.com> | Mon Jan 11 17:15:40 2016 -0800 |
tree | 1f1cac7184a79ef329be21ad901efa6a0cc2c4fa | |
parent | a16a704af08f30f11a5d184038cf59d5ebffe78a [diff] [blame] |
Apply scroll to windows added to a non-resizeble task that's docked bug: 26447921 Change-Id: I933e277137fb127a9e961035cf48cba2bef52042
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 51787b0..a9025bd 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -393,7 +393,7 @@ } mTouchExcludeRegion.op(mTmpRect, Region.Op.DIFFERENCE); } - if (task.isDockedInEffect() && !task.isResizeable()) { + if (task.isTwoFingerScrollMode()) { stack.getBounds(mTmpRect); mNonResizeableRegion.op(mTmpRect, Region.Op.UNION); break;