Skip to content

Commit fe1c0d6

Browse files
imhappidrchen
authored andcommitted
[Catalog][NavigationDrawer] Update nav drawer demo to use dispatchKeyEvent instead of onKeyDown since onKeyDown can sometimes be consumed by a view with focus
PiperOrigin-RevId: 797825692
1 parent e69709f commit fe1c0d6

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

catalog/java/io/material/catalog/navigationdrawer/CustomNavigationDrawerDemoActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@ public void onBackCancelled() {
196196
}
197197

198198
@Override
199-
public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
200-
if (keyCode == KeyEvent.KEYCODE_ESCAPE
199+
public boolean dispatchKeyEvent(KeyEvent keyEvent) {
200+
if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_ESCAPE
201201
&& (drawerLayout.isDrawerOpen(GravityCompat.START)
202202
|| drawerLayout.isDrawerOpen(GravityCompat.END))) {
203203
drawerLayout.closeDrawers();
204204
return true;
205205
}
206-
return super.onKeyDown(keyCode, keyEvent);
206+
return super.dispatchKeyEvent(keyEvent);
207207
}
208208
}

catalog/java/io/material/catalog/navigationdrawer/NavigationDrawerDemoActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ private void initNavigationView(NavigationView navigationView) {
125125
}
126126

127127
@Override
128-
public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
129-
if (keyCode == KeyEvent.KEYCODE_ESCAPE
128+
public boolean dispatchKeyEvent(KeyEvent keyEvent) {
129+
if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_ESCAPE
130130
&& (drawerLayout.isDrawerOpen(GravityCompat.START)
131131
|| drawerLayout.isDrawerOpen(GravityCompat.END))) {
132132
drawerLayout.closeDrawers();
133133
return true;
134134
}
135-
return super.onKeyDown(keyCode, keyEvent);
135+
return super.dispatchKeyEvent(keyEvent);
136136
}
137137

138138
@Override

docs/components/NavigationDrawer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,12 +497,12 @@ open drawers.
497497

498498
```java
499499
@Override
500-
public boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
501-
if (keyCode == KeyEvent.KEYCODE_ESCAPE && drawerLayout.isDrawerOpen(navigationView)) {
500+
public boolean dispatchKeyEvent(KeyEvent keyEvent) {
501+
if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_ESCAPE && drawerLayout.isDrawerOpen(navigationView)) {
502502
drawerLayout.closeDrawer(navigationView);
503503
return true;
504504
}
505-
return super.onKeyDown(keyCode, keyEvent);
505+
return super.dispatchKeyEvent(keyEvent);
506506
}
507507
```
508508

0 commit comments

Comments
 (0)