Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix KeyboardShortcuts show"

Browse Source
This commit is contained in:
Peeyush Agarwal
2017-02-14 17:09:58 +00:00
committed by Android (Google) Code Review
parent 3571b79c7f 64f0cae9f4
commit 1ea19d3463
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java
View File

@@ -381,12 +381,7 @@ 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);
}
}
showKeyboardShortcutsDialog(result);
}
}, deviceId);
}
@@ -585,7 +580,12 @@ public final class KeyboardShortcuts {
mKeyboardShortcutsDialog.setCanceledOnTouchOutside(true);
Window keyboardShortcutsWindow = mKeyboardShortcutsDialog.getWindow();
keyboardShortcutsWindow.setType(TYPE_SYSTEM_DIALOG);
mKeyboardShortcutsDialog.show();
synchronized (sLock) {
// showKeyboardShortcutsDialog only if it has not been dismissed already
if (sInstance != null) {
mKeyboardShortcutsDialog.show();
}
}
}
private void populateKeyboardShortcuts(LinearLayout keyboardShortcutsLayout,