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

Commit ad9952ee authored by Juan Sebastian Martinez's avatar Juan Sebastian Martinez Committed by Android (Google) Code Review
Browse files

Merge "Moving to aconfig flag to control the haptic brightness slider plugin" into main

parents 3e992962 a1184704

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −4
Original line number Diff line number Diff line
@@ -792,10 +792,6 @@ object Flags { 
    @JvmField

    val SHARE_WIFI_QS_BUTTON = releasedFlag("share_wifi_qs_button")



    /** Enable haptic slider component in the brightness slider */

    @JvmField

    val HAPTIC_BRIGHTNESS_SLIDER = unreleasedFlag("haptic_brightness_slider", teamfood = true)



    // TODO(b/287205379): Tracking bug

    @JvmField

    val QS_CONTAINER_GRAPH_OPTIMIZER = releasedFlag( "qs_container_graph_optimizer")

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

+2 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.settings.brightness;



import static com.android.systemui.flags.Flags.HAPTIC_BRIGHTNESS_SLIDER;

import static com.android.systemui.Flags.hapticBrightnessSlider;



import android.content.Context;

import android.view.LayoutInflater;
@@ -32,7 +32,6 @@ import com.android.settingslib.RestrictedLockUtils; 
import com.android.systemui.Gefingerpoken;

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;
@@ -280,7 +279,6 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV 


        private final FalsingManager mFalsingManager;

        private final UiEventLogger mUiEventLogger;

        private final FeatureFlagsClassic mFeatureFlags;

        private final VibratorHelper mVibratorHelper;

        private final SystemClock mSystemClock;

        private final CoroutineDispatcher mMainDispatcher;
@@ -292,12 +290,10 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV 
                UiEventLogger uiEventLogger,

                VibratorHelper vibratorHelper,

                SystemClock clock,

                FeatureFlagsClassic featureFlags,

                @Main CoroutineDispatcher mainDispatcher,

                ActivityStarter activityStarter) {

            mFalsingManager = falsingManager;

            mUiEventLogger = uiEventLogger;

            mFeatureFlags = featureFlags;

            mVibratorHelper = vibratorHelper;

            mSystemClock = clock;

            mMainDispatcher = mainDispatcher;
@@ -320,7 +316,7 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV 
            root.setActivityStarter(mActivityStarter);



            BrightnessSliderHapticPlugin plugin;

            if (mFeatureFlags.isEnabled(HAPTIC_BRIGHTNESS_SLIDER)) {

            if (hapticBrightnessSlider()) {

                plugin = new BrightnessSliderHapticPluginImpl(

                    mVibratorHelper,

                    mSystemClock,