commit 64f7b8234092b309afea9e2e29460185b330342b
author Kirill Grouchnikov <kirillg@google.com> Mon Nov 02 17:20:26 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 02 17:20:26 2015 +0000
tree 3b33db425059ea036ef15ecfbf7a6f4497566873
parent 12647500b3a5ae70eb47f3fa4a026994277bb0ff
parent 7b69fc37eed8a2c6a1680fa2b7d2735752e34d1d

Merge "Respect drawer's lock state in drawer toggle." into mnc-ub-dev

v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java

diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java b/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
index 6dceaf6..c15c531 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
@@ -282,9 +282,11 @@
     }
 
     private void toggle() {
-        if (mDrawerLayout.isDrawerVisible(GravityCompat.START)) {
+        int drawerLockMode = mDrawerLayout.getDrawerLockMode(GravityCompat.START);
+        if (mDrawerLayout.isDrawerVisible(GravityCompat.START)
+                && (drawerLockMode != DrawerLayout.LOCK_MODE_LOCKED_OPEN)) {
             mDrawerLayout.closeDrawer(GravityCompat.START);
-        } else {
+        } else if (drawerLockMode != DrawerLayout.LOCK_MODE_LOCKED_CLOSED) {
             mDrawerLayout.openDrawer(GravityCompat.START);
         }
     }