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

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

Merge "Unregister prox sensor when QS or Bouncer are expanded."

parents 0b2c26e4 1b2144d6

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.io.PrintWriter; 
public interface FalsingManager {

    int VERSION = 3;



    void onSucccessfulUnlock();

    void onSuccessfulUnlock();



    void onNotificationActive();

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class FalsingManagerFake implements FalsingManager { 
    private boolean mIsReportingEnabled;



    @Override

    public void onSucccessfulUnlock() {

    public void onSuccessfulUnlock() {



    }

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

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public class FalsingManagerImpl implements FalsingManager { 
        sessionExitpoint(false /* force */);

    }



    public void onSucccessfulUnlock() {

    public void onSuccessfulUnlock() {

        if (FalsingLog.ENABLED) {

            FalsingLog.i("onSucccessfulUnlock", "");

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ public class FalsingManagerProxy implements FalsingManager, Dumpable { 
    }



    @Override

    public void onSucccessfulUnlock() {

        mInternalFalsingManager.onSucccessfulUnlock();

    public void onSuccessfulUnlock() {

        mInternalFalsingManager.onSuccessfulUnlock();

    }



    @Override

packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java

+12 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ public class BrightLineFalsingManager implements FalsingManager { 


    private void updateInteractionType(@Classifier.InteractionType int type) {

        logDebug("InteractionType: " + type);

        mClassifiers.forEach((classifier) -> classifier.setInteractionType(type));

        mDataProvider.setInteractionType(type);

    }



    @Override
@@ -216,7 +216,7 @@ public class BrightLineFalsingManager implements FalsingManager { 
    }



    @Override

    public void onSucccessfulUnlock() {

    public void onSuccessfulUnlock() {

        if (mIsFalseTouchCalls != 0) {

            mMetricsLogger.histogram(FALSING_SUCCESS, mIsFalseTouchCalls);

            mIsFalseTouchCalls = 0;
@@ -263,7 +263,12 @@ public class BrightLineFalsingManager implements FalsingManager { 
    }



    @Override

    public void setQsExpanded(boolean b) {

    public void setQsExpanded(boolean expanded) {

        if (expanded) {

            unregisterSensors();

        } else if (mSessionStarted) {

            registerSensors();

        }

    }



    @Override
@@ -366,10 +371,14 @@ public class BrightLineFalsingManager implements FalsingManager { 


    @Override

    public void onBouncerShown() {

        unregisterSensors();

    }



    @Override

    public void onBouncerHidden() {

        if (mSessionStarted) {

            registerSensors();

        }

    }



    @Override