Merge "Disable overflow menu on lock screen." into rvc-dev am: 126b567a6e am:... (8a5e829e) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;