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

Commit c0e6e25c authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Disable falsing when resting on a Dock."

parents 0041b171 9febfeb0

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarBatteryController.java

+5 −0
Original line number Diff line number Diff line
@@ -251,6 +251,11 @@ public class CarBatteryController extends BroadcastReceiver implements BatteryCo 
        // TODO: Car demo mode.

    }



    @Override

    public boolean isPluggedIn() {

        return true;

    }



    @Override

    public boolean isPowerSave() {

        // Power save is not valid for the car, so always return false.

packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingManager.java

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.io.PrintWriter; 
 */

@ProvidesInterface(version = FalsingManager.VERSION)

public interface FalsingManager {

    int VERSION = 2;

    int VERSION = 3;



    void onSucccessfulUnlock();
@@ -48,7 +48,7 @@ public interface FalsingManager { 


    void setNotificationExpanded();



    boolean isClassiferEnabled();

    boolean isClassifierEnabled();



    void onQsDown();

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ public class SwipeHelper implements Gefingerpoken { 


    public boolean isFalseGesture(MotionEvent ev) {

        boolean falsingDetected = mCallback.isAntiFalsingNeeded();

        if (mFalsingManager.isClassiferEnabled()) {

        if (mFalsingManager.isClassifierEnabled()) {

            falsingDetected = falsingDetected && mFalsingManager.isFalseTouch();

        } else {

            falsingDetected = falsingDetected && !mTouchAboveFalsingThreshold;

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerFake.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class FalsingManagerFake implements FalsingManager { 
    }



    @Override

    public boolean isClassiferEnabled() {

    public boolean isClassifierEnabled() {

        return mIsClassiferEnabled;

    }

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ public class FalsingManagerImpl implements FalsingManager { 


    private void onSessionStart() {

        if (FalsingLog.ENABLED) {

            FalsingLog.i("onSessionStart", "classifierEnabled=" + isClassiferEnabled());

            FalsingLog.i("onSessionStart", "classifierEnabled=" + isClassifierEnabled());

            clearPendingWtf();

        }

        mBouncerOn = false;
@@ -246,7 +246,7 @@ public class FalsingManagerImpl implements FalsingManager { 
        }

    }



    public boolean isClassiferEnabled() {

    public boolean isClassifierEnabled() {

        return mHumanInteractionClassifier.isEnabled();

    }
@@ -544,7 +544,7 @@ public class FalsingManagerImpl implements FalsingManager { 


    public void dump(PrintWriter pw) {

        pw.println("FALSING MANAGER");

        pw.print("classifierEnabled="); pw.println(isClassiferEnabled() ? 1 : 0);

        pw.print("classifierEnabled="); pw.println(isClassifierEnabled() ? 1 : 0);

        pw.print("mSessionActive="); pw.println(mSessionActive ? 1 : 0);

        pw.print("mBouncerOn="); pw.println(mSessionActive ? 1 : 0);

        pw.print("mState="); pw.println(StatusBarState.toShortString(mState));