Commit 1a0f36f4 authored Jan 06, 2017 by Peeyush Agarwal

Fix KeyboardShortcuts show

The keyboard shortcuts should be shown only if they have not been
dismissed already (by using the dismiss method). Check that sInstance is
not null in the onKeyboardShortcutsReceived callback before displaying
the dialog. Earlier, a call to activity's dismissKeyboardShortcutsHelper
right after a call to requestShowKeyboardShortcuts would not dismiss the
popup which is not the case now.

Test: Manual
Change-Id: I544708b003d6baab92cac2b6fce71698dbbdaf0c

parent 3897ad6e

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -381,8 +381,13 @@ 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);
		}