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

Commit 2d1806b2 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Add Falsing to quick settings bottom buttons. 

Bug: 172655679
Test: manual
Change-Id: Ic8b9126c4c1d7d289f6fc9a37d6706862f7c8ff0
parent 96eae6b1

packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java

+14 −6
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; 
import com.android.systemui.R;

import com.android.systemui.globalactions.GlobalActionsDialogLite;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.qs.dagger.QSScope;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.phone.MultiUserSwitch;
@@ -62,6 +63,7 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme 
    private final QuickQSPanelController mQuickQSPanelController;

    private final TunerService mTunerService;

    private final MetricsLogger mMetricsLogger;

    private final FalsingManager mFalsingManager;

    private final SettingsButton mSettingsButton;

    private final TextView mBuildText;

    private final View mEdit;
@@ -83,8 +85,9 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme 
    private final View.OnClickListener mSettingsOnClickListener = new View.OnClickListener() {

        @Override

        public void onClick(View v) {

            // Don't do anything until view are unhidden

            if (!mExpanded) {

            // Don't do anything until views are unhidden. Don't do anything if the tap looks

            // suspicious.

            if (!mExpanded || mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {

                return;

            }
@@ -132,7 +135,7 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme 
            DeviceProvisionedController deviceProvisionedController, UserTracker userTracker,

            QSPanelController qsPanelController, QSDetailDisplayer qsDetailDisplayer,

            QuickQSPanelController quickQSPanelController,

            TunerService tunerService, MetricsLogger metricsLogger,

            TunerService tunerService, MetricsLogger metricsLogger, FalsingManager falsingManager,

            @Named(PM_LITE_ENABLED) boolean showPMLiteButton,

            GlobalActionsDialogLite globalActionsDialog) {

        super(view);
@@ -146,6 +149,7 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme 
        mQuickQSPanelController = quickQSPanelController;

        mTunerService = tunerService;

        mMetricsLogger = metricsLogger;

        mFalsingManager = falsingManager;



        mSettingsButton = mView.findViewById(R.id.settings_button);

        mBuildText = mView.findViewById(R.id.build);
@@ -184,9 +188,13 @@ public class QSFooterViewController extends ViewController<QSFooterView> impleme 
            return false;

        });



        mEdit.setOnClickListener(view ->

        mEdit.setOnClickListener(view -> {

            if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {

                return;

            }

            mActivityStarter.postQSRunnableDismissingKeyguard(() ->

                        mQsPanelController.showEdit(view)));

                    mQsPanelController.showEdit(view));

        });



        mMultiUserSwitch.setQSDetailDisplayer(mQsDetailDisplayer);

        mQsPanelController.setFooterPageIndicator(mPageIndicator);

packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.logging.testing.FakeMetricsLogger;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.classifier.FalsingManagerFake;

import com.android.systemui.globalactions.GlobalActionsDialogLite;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.settings.UserTracker;
@@ -121,7 +122,7 @@ public class QSFooterViewControllerTest extends LeakCheckedTest { 
        mController = new QSFooterViewController(mView, mUserManager, mUserInfoController,

                mActivityStarter, mDeviceProvisionedController, mUserTracker, mQSPanelController,

                new QSDetailDisplayer(), mQuickQSPanelController, mFakeTunerService,

                mMetricsLogger, false, mGlobalActionsDialog);

                mMetricsLogger, new FalsingManagerFake(), false, mGlobalActionsDialog);



        mController.init();

    }