diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-10-05 20:25:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-05 20:25:42 +0000 |
| commit | 1d08a5cd3b170097e4f7d6bd35ba88da27c609b2 (patch) | |
| tree | d9c2c445351a625d874a32b2b37cdb84b64531d4 | |
| parent | e395f3a36fda2b0277e267fc8eb1d2fba8d0caf5 (diff) | |
| parent | 1162a0b0bad0349c38e43a79b4670ff89ed38125 (diff) | |
| download | support-snap-temp-L74000000709751288.tar.gz | |
Merge "Merge cherrypicks of [1449600] into androidx-navigation-release" into androidx-navigation-releasesnap-temp-L74000000709751288snap-temp-L06500000709733108snap-temp-L00500000709737552
| -rw-r--r-- | drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java | 14 |
1 files changed, 2 insertions, 12 deletions
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 20330d65bc7..0d1d6c067b6 100644 --- a/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java +++ b/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java @@ -1716,15 +1716,10 @@ public class DrawerLayout extends ViewGroup implements Openable { /** * 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); } /** @@ -1799,15 +1794,10 @@ public class DrawerLayout extends ViewGroup implements Openable { /** * 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); } /** |