From 14f08a8fef98924d0d3bbcf3004682ecd9ec1ab9 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <anthonyrestaino11@gmail.com>
Date: Thu, 10 Mar 2016 22:23:32 -0500
Subject: [PATCH] Update to latest support library, improve drawer closing
 experience

---
 app/build.gradle                              | 10 +--
 .../lightning/activity/BrowserActivity.java   | 84 +++++++++----------
 2 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 217d515..3553b98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,11 +69,11 @@ dexcount {
 
 dependencies {
     // support libraries
-    compile 'com.android.support:palette-v7:23.1.1'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:design:23.1.1'
-    compile 'com.android.support:recyclerview-v7:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:palette-v7:23.2.1'
+    compile 'com.android.support:appcompat-v7:23.2.1'
+    compile 'com.android.support:design:23.2.1'
+    compile 'com.android.support:recyclerview-v7:23.2.1'
+    compile 'com.android.support:support-v4:23.2.1'
 
     // html parsing fo reading mode
     compile 'org.jsoup:jsoup:1.8.3'
diff --git a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
index d00e506..5c114ee 100644
--- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
+++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
@@ -278,28 +278,27 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
         mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null);
         mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null);
 
-        //TODO restore when upgrading support library
-//        mDrawerLayout.addDrawerListener(new DrawerListener() {
-//            @Override
-//            public void onDrawerSlide(View drawerView, float slideOffset) {}
-//
-//            @Override
-//            public void onDrawerOpened(View drawerView) {}
-//
-//            @Override
-//            public void onDrawerClosed(View drawerView) {}
-//
-//            @Override
-//            public void onDrawerStateChanged(int newState) {
-//                if (newState == DrawerLayout.STATE_DRAGGING) {
-//                    mDrawerLeft.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-//                    mDrawerRight.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-//                } else if (newState == DrawerLayout.STATE_IDLE) {
-//                    mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null);
-//                    mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null);
-//                }
-//            }
-//        });
+        mDrawerLayout.addDrawerListener(new DrawerListener() {
+            @Override
+            public void onDrawerSlide(View drawerView, float slideOffset) {}
+
+            @Override
+            public void onDrawerOpened(View drawerView) {}
+
+            @Override
+            public void onDrawerClosed(View drawerView) {}
+
+            @Override
+            public void onDrawerStateChanged(int newState) {
+                if (newState == DrawerLayout.STATE_DRAGGING) {
+                    mDrawerLeft.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+                    mDrawerRight.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+                } else if (newState == DrawerLayout.STATE_IDLE) {
+                    mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null);
+                    mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null);
+                }
+            }
+        });
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !mShowTabsInDrawer) {
             getWindow().setStatusBarColor(Color.BLACK);
@@ -1410,29 +1409,24 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
         }
         mDrawerLayout.closeDrawers();
 
-        // TODO restore after updating to latest support lib
-        // delete this code after restoring
-        if (runnable != null) {
-            runnable.run();
-        }
-//        mDrawerLayout.addDrawerListener(new DrawerListener() {
-//            @Override
-//            public void onDrawerSlide(View drawerView, float slideOffset) {}
-//
-//            @Override
-//            public void onDrawerOpened(View drawerView) {}
-//
-//            @Override
-//            public void onDrawerClosed(View drawerView) {
-//                if (runnable != null) {
-//                    runnable.run();
-//                }
-//                mDrawerLayout.removeDrawerListener(this);
-//            }
-//
-//            @Override
-//            public void onDrawerStateChanged(int newState) {}
-//        });
+        mDrawerLayout.addDrawerListener(new DrawerListener() {
+            @Override
+            public void onDrawerSlide(View drawerView, float slideOffset) {}
+
+            @Override
+            public void onDrawerOpened(View drawerView) {}
+
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                if (runnable != null) {
+                    runnable.run();
+                }
+                mDrawerLayout.removeDrawerListener(this);
+            }
+
+            @Override
+            public void onDrawerStateChanged(int newState) {}
+        });
     }
 
     @Override