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

Commit 3332ae3f authored by Nikolas Havrikov's avatar Nikolas Havrikov
Browse files

Inject ActivityStarter into ToggleSeekBar 

This avoids relying on the deprecated Dependency.get

Fix: 218352033
Test: presubmit
Change-Id: Ifc6a77ddd919691fb5473df4dfa3583494a4051e
parent 1559d46a

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderController.java

+8 −3
Original line number Diff line number Diff line
@@ -30,12 +30,13 @@ import androidx.annotation.Nullable; 
import com.android.internal.logging.UiEventLogger;

import com.android.settingslib.RestrictedLockUtils;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.res.R;

import com.android.systemui.classifier.Classifier;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.flags.FeatureFlagsClassic;

import com.android.systemui.haptics.slider.SeekableSliderEventProducer;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import com.android.systemui.util.ViewController;
@@ -283,6 +284,7 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV 
        private final VibratorHelper mVibratorHelper;

        private final SystemClock mSystemClock;

        private final CoroutineDispatcher mMainDispatcher;

        private final ActivityStarter mActivityStarter;



        @Inject

        public Factory(
@@ -291,14 +293,15 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV 
                VibratorHelper vibratorHelper,

                SystemClock clock,

                FeatureFlagsClassic featureFlags,

                @Main CoroutineDispatcher mainDispatcher

        ) {

                @Main CoroutineDispatcher mainDispatcher,

                ActivityStarter activityStarter) {

            mFalsingManager = falsingManager;

            mUiEventLogger = uiEventLogger;

            mFeatureFlags = featureFlags;

            mVibratorHelper = vibratorHelper;

            mSystemClock = clock;

            mMainDispatcher = mainDispatcher;

            mActivityStarter = activityStarter;

        }



        /**
@@ -314,6 +317,8 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV 
            int layout = getLayout();

            BrightnessSliderView root = (BrightnessSliderView) LayoutInflater.from(context)

                    .inflate(layout, viewRoot, false);

            root.setActivityStarter(mActivityStarter);



            BrightnessSliderHapticPlugin plugin;

            if (mFeatureFlags.isEnabled(HAPTIC_BRIGHTNESS_SLIDER)) {

                plugin = new BrightnessSliderHapticPluginImpl(

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderView.java

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import androidx.annotation.Nullable; 


import com.android.settingslib.RestrictedLockUtils;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.res.R;



/**
@@ -41,6 +42,7 @@ import com.android.systemui.res.R; 
 */

public class BrightnessSliderView extends FrameLayout {



    private ActivityStarter mActivityStarter;

    @NonNull

    private ToggleSeekBar mSlider;

    private DispatchTouchEventListener mListener;
@@ -57,6 +59,10 @@ public class BrightnessSliderView extends FrameLayout { 
        super(context, attrs);

    }



    public void setActivityStarter(@NonNull ActivityStarter activityStarter) {

        mActivityStarter = activityStarter;

    }



    // Inflated from quick_settings_brightness_dialog

    @Override

    protected void onFinishInflate() {
@@ -65,6 +71,7 @@ public class BrightnessSliderView extends FrameLayout { 


        mSlider = requireViewById(R.id.slider);

        mSlider.setAccessibilityLabel(getContentDescription().toString());

        mSlider.setActivityStarter(mActivityStarter);



        // Finds the progress drawable. Assumes brightness_progress_drawable.xml

        try {

packages/SystemUI/src/com/android/systemui/settings/brightness/ToggleSeekBar.java

+9 −2
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@ import android.view.MotionEvent; 
import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.SeekBar;



import androidx.annotation.NonNull;



import com.android.settingslib.RestrictedLockUtils;

import com.android.systemui.Dependency;

import com.android.systemui.plugins.ActivityStarter;



public class ToggleSeekBar extends SeekBar {
@@ -32,6 +33,8 @@ public class ToggleSeekBar extends SeekBar { 


    private RestrictedLockUtils.EnforcedAdmin mEnforcedAdmin = null;



    private ActivityStarter mActivityStarter;



    public ToggleSeekBar(Context context) {

        super(context);

    }
@@ -49,7 +52,7 @@ public class ToggleSeekBar extends SeekBar { 
        if (mEnforcedAdmin != null) {

            Intent intent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(

                    mContext, mEnforcedAdmin);

            Dependency.get(ActivityStarter.class).postStartActivityDismissingKeyguard(intent, 0);

            mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);

            return true;

        }

        if (!isEnabled()) {
@@ -74,4 +77,8 @@ public class ToggleSeekBar extends SeekBar { 
    public void setEnforcedAdmin(RestrictedLockUtils.EnforcedAdmin admin) {

        mEnforcedAdmin = admin;

    }



    public void setActivityStarter(@NonNull ActivityStarter activityStarter) {

        mActivityStarter = activityStarter;

    }

}