r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Roll back support library until fragment backgrounds are fixed

Browse Source
This commit is contained in:
Anthony Restaino 2016-03-09 22:54:48 -05:00
parent 2f8feead71
commit d3ac7187bb
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/build.gradle
View File

@ -69,17 +69,10 @@ dexcount {
dependencies { dependencies {
// support libraries // support libraries
compile 'com.android.support:palette-v7:23.2.0' compile 'com.android.support:palette-v7:23.1.1'
compile('com.android.support:appcompat-v7:23.2.0') { compile 'com.android.support:appcompat-v7:23.1.1'
exclude group: 'com.android.support', module: 'support-v4' compile 'com.android.support:design:23.1.1'
} compile 'com.android.support:recyclerview-v7:23.1.1'
compile('com.android.support:design:23.2.0') {
exclude group: 'com.android.support', module: 'support-v4'
}
compile('com.android.support:recyclerview-v7:23.2.0') {
exclude group: 'com.android.support', module: 'support-v4'
}
// Temp downgrade until google fixes the support lib
compile 'com.android.support:support-v4:23.1.1' compile 'com.android.support:support-v4:23.1.1'
// html parsing fo reading mode // html parsing fo reading mode

83
app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
View File

@ -278,27 +278,28 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null); mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null);
mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null); mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null);
mDrawerLayout.addDrawerListener(new DrawerListener() { //TODO restore when upgrading support library
@Override // mDrawerLayout.addDrawerListener(new DrawerListener() {
public void onDrawerSlide(View drawerView, float slideOffset) {} // @Override
// public void onDrawerSlide(View drawerView, float slideOffset) {}
@Override //
public void onDrawerOpened(View drawerView) {} // @Override
// public void onDrawerOpened(View drawerView) {}
@Override //
public void onDrawerClosed(View drawerView) {} // @Override
// public void onDrawerClosed(View drawerView) {}
@Override //
public void onDrawerStateChanged(int newState) { // @Override
if (newState == DrawerLayout.STATE_DRAGGING) { // public void onDrawerStateChanged(int newState) {
mDrawerLeft.setLayerType(View.LAYER_TYPE_HARDWARE, null); // if (newState == DrawerLayout.STATE_DRAGGING) {
mDrawerRight.setLayerType(View.LAYER_TYPE_HARDWARE, null); // mDrawerLeft.setLayerType(View.LAYER_TYPE_HARDWARE, null);
} else if (newState == DrawerLayout.STATE_IDLE) { // mDrawerRight.setLayerType(View.LAYER_TYPE_HARDWARE, null);
mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null); // } else if (newState == DrawerLayout.STATE_IDLE) {
mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null); // mDrawerLeft.setLayerType(View.LAYER_TYPE_NONE, null);
} // mDrawerRight.setLayerType(View.LAYER_TYPE_NONE, null);
} // }
}); // }
// });
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !mShowTabsInDrawer) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !mShowTabsInDrawer) {
getWindow().setStatusBarColor(Color.BLACK); getWindow().setStatusBarColor(Color.BLACK);
@ -1408,24 +1409,30 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
} }
} }
mDrawerLayout.closeDrawers(); mDrawerLayout.closeDrawers();
mDrawerLayout.addDrawerListener(new DrawerListener() {
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {}
@Override // TODO restore after updating to latest support lib
public void onDrawerOpened(View drawerView) {} // delete this code after restoring
if (runnable != null) {
@Override runnable.run();
public void onDrawerClosed(View drawerView) { }
if (runnable != null) { // mDrawerLayout.addDrawerListener(new DrawerListener() {
runnable.run(); // @Override
} // public void onDrawerSlide(View drawerView, float slideOffset) {}
mDrawerLayout.removeDrawerListener(this); //
} // @Override
// public void onDrawerOpened(View drawerView) {}
@Override //
public void onDrawerStateChanged(int newState) {} // @Override
}); // public void onDrawerClosed(View drawerView) {
// if (runnable != null) {
// runnable.run();
// }
// mDrawerLayout.removeDrawerListener(this);
// }
//
// @Override
// public void onDrawerStateChanged(int newState) {}
// });
} }
@Override @Override