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

Commit a4f17a8c authored by Nikolas Havrikov's avatar Nikolas Havrikov
Browse files

Revert "Inject ActivityStarter into ToggleSeekBar" 

This reverts commit 3332ae3f.

Reason for revert: regression
Bug: 309588939

Change-Id: I73e9e4c5dcc7c0339f97d3a4f6d1413db225f4bb
parent e6584d79

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

+3 −8
Original line number Diff line number Diff line
@@ -30,12 +30,11 @@ 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.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;
@@ -282,7 +281,6 @@ 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(
@@ -290,14 +288,13 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV 
                UiEventLogger uiEventLogger,

                VibratorHelper vibratorHelper,

                SystemClock clock,

                @Main CoroutineDispatcher mainDispatcher,

                ActivityStarter activityStarter) {

                @Main CoroutineDispatcher mainDispatcher

        ) {

            mFalsingManager = falsingManager;

            mUiEventLogger = uiEventLogger;

            mVibratorHelper = vibratorHelper;

            mSystemClock = clock;

            mMainDispatcher = mainDispatcher;

            mActivityStarter = activityStarter;

        }



        /**
@@ -313,8 +310,6 @@ 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 (hapticBrightnessSlider()) {

                plugin = new BrightnessSliderHapticPluginImpl(

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

+0 −7
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 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;



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

public class BrightnessSliderView extends FrameLayout {



    private ActivityStarter mActivityStarter;

    @NonNull

    private ToggleSeekBar mSlider;

    private DispatchTouchEventListener mListener;
@@ -59,10 +57,6 @@ 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() {
@@ -71,7 +65,6 @@ 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

+2 −9
Original line number Diff line number Diff line
@@ -23,9 +23,8 @@ 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 {
@@ -33,8 +32,6 @@ public class ToggleSeekBar extends SeekBar { 


    private RestrictedLockUtils.EnforcedAdmin mEnforcedAdmin = null;



    private ActivityStarter mActivityStarter;



    public ToggleSeekBar(Context context) {

        super(context);

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

            Intent intent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(

                    mContext, mEnforcedAdmin);

            mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);

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

            return true;

        }

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

        mEnforcedAdmin = admin;

    }



    public void setActivityStarter(@NonNull ActivityStarter activityStarter) {

        mActivityStarter = activityStarter;

    }

}