Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes in FalsingManager Classifiers and Evaluators and in DragDownHelper"

Browse Source
This commit is contained in:
Selim Cinek
2015-10-16 23:33:22 +00:00
committed by Android (Google) Code Review
parent b5b990ffd1 52af6b646b
commit 0c21d74a1e
8 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/classifier/AnglesPercentageEvaluator.java
View File

@@ -20,8 +20,8 @@ public class AnglesPercentageEvaluator {
public static float evaluate(float value) {
float evaluation = 0.0f;
if (value < 1.00) evaluation++;
if (value < 0.95) evaluation++;
if (value < 0.90) evaluation++;
if (value < 0.70) evaluation++;
return evaluation;
}
}

8
packages/SystemUI/src/com/android/systemui/classifier/EndPointRatioClassifier.java
View File

@@ -27,10 +27,12 @@ public class EndPointRatioClassifier extends StrokeClassifier {
@Override
public float getFalseTouchEvaluation(int type, Stroke stroke) {
float ratio;
if (stroke.getTotalLength() == 0.0f) {
return 1.0f;
ratio = 1.0f;
} else {
ratio = stroke.getEndPointLength() / stroke.getTotalLength();
}
return EndPointRatioEvaluator.evaluate(
stroke.getEndPointLength() / stroke.getTotalLength());
return EndPointRatioEvaluator.evaluate(ratio);
}
}

2
packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java
View File

@@ -48,7 +48,7 @@ public class HumanInteractionClassifier extends Classifier {
private final float mDpi;
private HistoryEvaluator mHistoryEvaluator;
private boolean mEnableClassifier = true;
private boolean mEnableClassifier = false;
private int mCurrentType = Classifier.GENERIC;
protected final ContentObserver mSettingsObserver = new ContentObserver(mHandler) {

2
packages/SystemUI/src/com/android/systemui/classifier/SpeedAnglesPercentageEvaluator.java
View File

@@ -20,8 +20,8 @@ public class SpeedAnglesPercentageEvaluator {
public static float evaluate(float value) {
float evaluation = 0.0f;
if (value < 1.00) evaluation++;
if (value < 0.95) evaluation++;
if (value < 0.90) evaluation++;
if (value < 0.70) evaluation++;
return evaluation;
}
}

7
packages/SystemUI/src/com/android/systemui/classifier/SpeedEvaluator.java
View File

@@ -19,9 +19,10 @@ package com.android.systemui.classifier;
public class SpeedEvaluator {
public static float evaluate(float value) {
float evaluation = 0.0f;
if (value < 4.0 || value > 35.0) evaluation += 1.0;
if (value < 2.2) evaluation += 1.0;
if (value > 50.0) evaluation += 1.0;
if (value < 4.0) evaluation++;
if (value < 2.2) evaluation++;
if (value > 35.0) evaluation++;
if (value > 50.0) evaluation++;
return evaluation;
}
}

6
packages/SystemUI/src/com/android/systemui/classifier/SpeedRatioEvaluator.java
View File

@@ -19,8 +19,10 @@ package com.android.systemui.classifier;
public class SpeedRatioEvaluator {
public static float evaluate(float value) {
float evaluation = 0.0f;
if (value > 9.0) ++evaluation;
if (value > 18.0) ++evaluation;
if (value <= 1.0) evaluation++;
if (value <= 0.5) evaluation++;
if (value > 9.0) evaluation++;
if (value > 18.0) evaluation++;
return evaluation;
}
}

8
packages/SystemUI/src/com/android/systemui/classifier/SpeedVarianceEvaluator.java
View File

@@ -19,10 +19,10 @@ package com.android.systemui.classifier;
public class SpeedVarianceEvaluator {
public static float evaluate(float value) {
float evaluation = 0.0f;
if (value > 0.06) evaluation += 1.0;
if (value > 0.15) evaluation += 1.0;
if (value > 0.3) evaluation += 1.0;
if (value > 0.6) evaluation += 1.0;
if (value > 0.06) evaluation++;
if (value > 0.15) evaluation++;
if (value > 0.3) evaluation++;
if (value > 0.6) evaluation++;
return evaluation;
}
}

5
packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
View File

@@ -149,10 +149,7 @@ public class DragDownHelper implements Gefingerpoken {
}
private boolean isFalseTouch() {
if (mFalsingManager.isClassiferEnabled()) {
return mFalsingManager.isFalseTouch();
}
return !mDraggedFarEnough;
return mFalsingManager.isFalseTouch() || !mDraggedFarEnough;
}
private void captureStartingChild(float x, float y) {