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

Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2017-09-05 18:01:57 +00:00
committed by Android (Google) Code Review
parent 32b477db15 633b6ba7e3
commit b0d617a643
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/values/config.xml
View File

@@ -417,4 +417,9 @@
vibrator is capable of subtle vibrations --> vibrator is capable of subtle vibrations -->
<bool name="config_vibrateOnIconAnimation">false</bool> <bool name="config_vibrateOnIconAnimation">false</bool>
<!-- If true, enable the advance anti-falsing classifier on the lockscreen. On some devices it
does not work well, particularly with noisy touchscreens. Note that disabling it may
increase the rate of unintentional unlocks. -->
<bool name="config_lockscreenAntiFalsingClassifierEnabled">true</bool>
</resources> </resources>

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

@@ -27,6 +27,8 @@ import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import com.android.systemui.R;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
@@ -37,9 +39,6 @@ public class HumanInteractionClassifier extends Classifier {
private static final String HIC_ENABLE = "HIC_enable"; private static final String HIC_ENABLE = "HIC_enable";
private static final float FINGER_DISTANCE = 0.1f; private static final float FINGER_DISTANCE = 0.1f;
/** Default value for the HIC_ENABLE setting: 1 - enabled, 0 - disabled */
private static final int HIC_ENABLE_DEFAULT = 1;
private static HumanInteractionClassifier sInstance = null; private static HumanInteractionClassifier sInstance = null;
private final Handler mHandler = new Handler(Looper.getMainLooper()); private final Handler mHandler = new Handler(Looper.getMainLooper());
@@ -106,9 +105,12 @@ public class HumanInteractionClassifier extends Classifier {
} }
private void updateConfiguration() { private void updateConfiguration() {
boolean defaultValue = mContext.getResources().getBoolean(
R.bool.config_lockscreenAntiFalsingClassifierEnabled);
mEnableClassifier = 0 != Settings.Global.getInt( mEnableClassifier = 0 != Settings.Global.getInt(
mContext.getContentResolver(), mContext.getContentResolver(),
HIC_ENABLE, HIC_ENABLE_DEFAULT); HIC_ENABLE, defaultValue ? 1 : 0);
} }
public void setType(int type) { public void setType(int type) {