Compare commits

..

No commits in common. "feature/zte-fix" and "master" have entirely different histories.

3 changed files with 7 additions and 8 deletions

View File

@ -8,8 +8,8 @@ buildscript {
} }
} }
dependencies { dependencies {
// classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:2.3.0'
// classpath 'com.github.dcendents:android-maven-plugin:1.2' classpath 'com.github.dcendents:android-maven-plugin:1.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -2,18 +2,17 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 9
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
} }
} }
dependencies { dependencies {
//noinspection GradleDependency compile 'com.android.support:recyclerview-v7:25.2.0'
implementation "com.android.support:recyclerview-v7:$supportLibraryVersion" compile 'com.android.support:support-v4:25.2.0'
//noinspection GradleDependency
implementation "com.android.support:support-v4:$supportLibraryVersion"
} }
apply from: './gradle-mvn-push.gradle' apply from: './gradle-mvn-push.gradle'

View File

@ -1307,7 +1307,7 @@ public class SwipeLayout extends FrameLayout {
} }
int surfaceLeft = surfaceView.getLeft(); int surfaceLeft = surfaceView.getLeft();
int surfaceTop = surfaceView.getTop(); int surfaceTop = surfaceView.getTop();
if (surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop() && !mIsBeingDragged) return Status.Close; if (surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop()) return Status.Close;
if (surfaceLeft == (getPaddingLeft() - mDragDistance) || surfaceLeft == (getPaddingLeft() + mDragDistance) if (surfaceLeft == (getPaddingLeft() - mDragDistance) || surfaceLeft == (getPaddingLeft() + mDragDistance)
|| surfaceTop == (getPaddingTop() - mDragDistance) || surfaceTop == (getPaddingTop() + mDragDistance)) || surfaceTop == (getPaddingTop() - mDragDistance) || surfaceTop == (getPaddingTop() + mDragDistance))