Ensure open() and close() always work
As per the Javadoc on LOCK_MODE_LOCKED_CLOSED
and LOCK_MODE_LOCKED_OPEN, the app should
still be able to open() and close() the drawer
programmatically.
This change aligns open() and close() with
openDrawer() and closeDrawer() to allow
programmatic usage no matter what LOCK_MODE
is used.
Test: tested in sample app
BUG: 162253907
Change-Id: I74f2f7ea5ff8ce06bfcfeff09aedd980f385ffc7
diff --git a/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java b/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
index 1b683ac..3ec954e 100644
--- a/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
+++ b/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
@@ -1718,15 +1718,10 @@
/**
* Open the {@link GravityCompat#START} drawer by animating it into view.
- * <p>
- * This has no effect if the {@link #getDrawerLockMode(int) drawer lock mode} is
- * {@link #LOCK_MODE_LOCKED_CLOSED}.
*/
@Override
public void open() {
- if (getDrawerLockMode(GravityCompat.START) != LOCK_MODE_LOCKED_CLOSED) {
- openDrawer(GravityCompat.START);
- }
+ openDrawer(GravityCompat.START);
}
/**
@@ -1801,15 +1796,10 @@
/**
* Close the {@link GravityCompat#START} drawer by animating it out of view.
- * <p>
- * This has no effect if the {@link #getDrawerLockMode(int) drawer lock mode} is
- * {@link #LOCK_MODE_LOCKED_OPEN}.
*/
@Override
public void close() {
- if (getDrawerLockMode(GravityCompat.START) != LOCK_MODE_LOCKED_OPEN) {
- closeDrawer(GravityCompat.START);
- }
+ closeDrawer(GravityCompat.START);
}
/**
