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

Commit f32d531a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Moved VibrateHelper as a dependency" into pi-dev

parents 2f848a13 e2b4d79f

packages/SystemUI/src/com/android/systemui/Dependency.java

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.power.EnhancedEstimatesImpl; 
import com.android.systemui.power.PowerNotificationWarnings;

import com.android.systemui.power.PowerUI;

import com.android.systemui.statusbar.AppOpsListener;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;

import com.android.systemui.statusbar.phone.DarkIconDispatcherImpl;

import com.android.systemui.statusbar.phone.LightBarController;
@@ -317,6 +318,8 @@ public class Dependency extends SystemUI { 


        mProviders.put(AppOpsListener.class, () -> new AppOpsListener(mContext));



        mProviders.put(VibratorHelper.class, () -> new VibratorHelper(mContext));



        // Put all dependencies above here so the factory can override them if it wants.

        SystemUIFactory.getInstance().injectDependencies(mProviders, mContext);

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 


        mOverviewProxyService = Dependency.get(OverviewProxyService.class);

        mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService);

        mVibratorHelper = new VibratorHelper(context);

        mVibratorHelper = Dependency.get(VibratorHelper.class);



        mConfiguration = new Configuration();

        mConfiguration.updateFrom(context.getResources().getConfiguration());

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.widget.FrameLayout; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.util.LatencyTracker;

import com.android.systemui.DejankUtils;

import com.android.systemui.Dependency;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.classifier.FalsingManager;
@@ -207,7 +208,7 @@ public abstract class PanelView extends FrameLayout { 
        mFalsingManager = FalsingManager.getInstance(context);

        mNotificationsDragEnabled =

                getResources().getBoolean(R.bool.config_enableNotificationShadeDrag);

        mVibratorHelper = new VibratorHelper(context);

        mVibratorHelper = Dependency.get(VibratorHelper.class);

        mVibrateOnOpening = mContext.getResources().getBoolean(

                R.bool.config_vibrateOnIconAnimation);

    }

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);



        mRipple = new KeyButtonRipple(context, this);

        mVibratorHelper = new VibratorHelper(context);

        mVibratorHelper = Dependency.get(VibratorHelper.class);

        mOverviewProxyService = Dependency.get(OverviewProxyService.class);

        setBackground(mRipple);

    }