Merge "Fix KeyboardShortcuts show" (1ea19d34) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -381,13 +381,8 @@ public final class KeyboardShortcuts {
		if (appShortcuts != null) {
		result.add(appShortcuts);
		}
		synchronized (sLock) {
		// showKeyboardShortcutsDialog only if it has not been dismissed already
		if (sInstance != null) {
		showKeyboardShortcutsDialog(result);
		}
		}
		}
		}, deviceId);
		}

		@@ -585,8 +580,13 @@ public final class KeyboardShortcuts {
		mKeyboardShortcutsDialog.setCanceledOnTouchOutside(true);
		Window keyboardShortcutsWindow = mKeyboardShortcutsDialog.getWindow();
		keyboardShortcutsWindow.setType(TYPE_SYSTEM_DIALOG);
		synchronized (sLock) {
		// showKeyboardShortcutsDialog only if it has not been dismissed already
		if (sInstance != null) {
		mKeyboardShortcutsDialog.show();
		}
		}
		}

		private void populateKeyboardShortcuts(LinearLayout keyboardShortcutsLayout,
		List<KeyboardShortcutGroup> keyboardShortcutGroups) {