Merge "Disable overflow menu on lock screen." into rvc-dev am: 126b567a6e

Change-Id: I4ea3550b870cde80d76ef3e56c16b4bb650b4662

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

@@ -482,7 +482,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
      */
     @VisibleForTesting
     protected int getMaxShownPowerItems() {
-        if (shouldUseControlsLayout()) {
+        // TODO: Overflow disabled on keyguard while we solve for touch blocking issues.
+        if (shouldUseControlsLayout() && !mKeyguardShowing) {
             return mResources.getInteger(com.android.systemui.R.integer.power_menu_max_columns);
         } else {
             return Integer.MAX_VALUE;