--- a/frameworks/base/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/frameworks/base/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1849,6 +1849,7 @@ public class KeyguardViewMediator extends SystemUI {
             // Disable aspects of the system/status/navigation bars that must not be re-enabled by
             // windows that appear on top, ever
             int flags = StatusBarManager.DISABLE_NONE;
+            flags = StatusBarManager.DISABLE_EXPAND;
             if (mShowing) {
                 // Permanently disable components not available when keyguard is enabled
                 // (like recents). Temporary enable/disable (e.g. the "back" button) are
diff --git a/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/Collapse
index 4339ade..ade4243 100644
--- a/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java
+++ b/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java
@@ -175,6 +175,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
                 state |= StatusBarManager.DISABLE_SYSTEM_INFO;
             }
         }
+        state |=StatusBarManager.DISABLE_EXPAND;
         return state;
     }
 
diff --git a/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationP
index 54c12a1..bb6351b 100644
--- a/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -606,7 +606,7 @@ public class NotificationPanelView extends PanelView implements
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
-        if (mBlockTouches || mQs.isCustomizing()) {
+        /*if (mBlockTouches || mQs.isCustomizing()) {
             return false;
         }
         initDownStates(event);
@@ -620,7 +620,8 @@ public class NotificationPanelView extends PanelView implements
         if (mQsOverscrollExpansionEnabled && !isFullyCollapsed() && onQsIntercept(event)) {
             return true;
         }
-        return super.onInterceptTouchEvent(event);
+        return super.onInterceptTouchEvent(event);*/
+        return true;