Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0d617a6 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

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

parents 32b477db 633b6ba7
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -417,4 +417,9 @@
     vibrator is capable of subtle vibrations -->
    <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>
+6 −4
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import android.util.DisplayMetrics;
import android.util.Log;
import android.view.MotionEvent;

import com.android.systemui.R;

import java.util.ArrayDeque;
import java.util.ArrayList;

@@ -37,9 +39,6 @@ public class HumanInteractionClassifier extends Classifier {
    private static final String HIC_ENABLE = "HIC_enable";
    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 final Handler mHandler = new Handler(Looper.getMainLooper());
@@ -106,9 +105,12 @@ public class HumanInteractionClassifier extends Classifier {
    }

    private void updateConfiguration() {
        boolean defaultValue = mContext.getResources().getBoolean(
                R.bool.config_lockscreenAntiFalsingClassifierEnabled);

        mEnableClassifier = 0 != Settings.Global.getInt(
                mContext.getContentResolver(),
                HIC_ENABLE, HIC_ENABLE_DEFAULT);
                HIC_ENABLE, defaultValue ? 1 : 0);
    }

    public void setType(int type) {