From 2a4b636a5320ab03db0c19c713b93fd1bc4f41f8 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 21 Nov 2015 18:21:58 -0500 Subject: [PATCH] Fix bug with navigation drawer, update gradle dependencies --- app/build.gradle | 10 +++++----- .../browser/lightning/activity/BrowserActivity.java | 1 + .../lightning/fragment/GeneralSettingsFragment.java | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 70d3e98..a382b6a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,10 +57,10 @@ dexcount { dependencies { // support libraries - compile 'com.android.support:palette-v7:23.1.0' - compile 'com.android.support:appcompat-v7:23.1.0' - compile 'com.android.support:design:23.1.0' - compile 'com.android.support:recyclerview-v7:23.1.0' + 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' // html parsing fo reading mode compile 'org.jsoup:jsoup:1.8.3' @@ -76,7 +76,7 @@ dependencies { compile 'com.jakewharton:butterknife:7.0.1' // permissions - compile 'com.anthonycr.grant:permissions:1.0' + compile 'com.anthonycr.grant:permissions:1.1.2' // proxy support compile 'net.i2p.android:client:0.7' 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 78d888c..c654a42 100644 --- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java @@ -302,6 +302,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements mArrowImage.setLayerType(View.LAYER_TYPE_HARDWARE, null); mArrowImage.setImageDrawable(mArrowDrawable); } else { + mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, mDrawerLeft); mArrowImage.setImageResource(R.drawable.ic_action_home); mArrowImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN); } diff --git a/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java index aa3b129..c5c95c8 100644 --- a/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java +++ b/app/src/main/java/acr/browser/lightning/fragment/GeneralSettingsFragment.java @@ -563,6 +563,7 @@ public class GeneralSettingsFragment extends LightningPreferenceFragment impleme return true; case SETTINGS_DRAWERTABS: mPreferenceManager.setShowTabsInDrawer(checked); + return true; default: return false; }