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

Temporarily revert v4 support until its fixed, add some documentation

Browse Source
This commit is contained in:
Anthony Restaino 2016-03-03 23:16:30 -05:00
parent 3fe2761552
commit 9c3607aa3d
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/build.gradle
View File

@ -70,9 +70,17 @@ dexcount {
dependencies {
// support libraries
compile 'com.android.support:palette-v7:23.2.0'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:design:23.2.0'
compile 'com.android.support:recyclerview-v7:23.2.0'
compile('com.android.support:appcompat-v7:23.2.0') {
exclude group: 'com.android.support', module: 'support-v4'
}
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'
// html parsing fo reading mode
compile 'org.jsoup:jsoup:1.8.3'
@ -100,6 +108,7 @@ dependencies {
// memory leak analysis
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
// compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
provided 'javax.annotation:jsr250-api:1.0'

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

@ -1841,6 +1841,13 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
}
}
/**
* This method initializes the height of the
* view that holds the current WebView. It waits
* for the root layout to be laid out before setting
* the height as it needs the root layout to be measured
* first.
*/
private void initializeTabHeight() {
doOnLayout(mRootLayout, new Runnable() {
@Override
@ -1850,6 +1857,13 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
});
}
/**
* Performs an action when the provided view is laid out.
*
* @param view the view to listen to for layouts.
* @param runnable the runnable to run when the view is
* laid out.
*/
private static void doOnLayout(@NonNull final View view, @NonNull final Runnable runnable) {
view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
@ -1864,6 +1878,12 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
});
}
/**
* This method sets the height of the browser
* frame view that holds the current WebView.
* It requires the root layout to be properly
* laid out in order to set the correct height.
*/
private void setTabHeight() {
if (mRootLayout.getHeight() == 0) {
mRootLayout.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);