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

Commit 63f8f262 authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "[Dagger] Remove Dependency.get from VolumeDialog...""... 

Merge "Revert "Revert "[Dagger] Remove Dependency.get from VolumeDialog..."" into sc-v2-dev am: eecd6074

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15661203

Change-Id: I20121a82ed09db91d06c9b0b678cb0ba56885fa2
parents 8c89f842 eecd6074

packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController; 
import com.android.systemui.statusbar.policy.IndividualSensorPrivacyControllerImpl;

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

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

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

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

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

import com.android.systemui.volume.dagger.VolumeModule;





import javax.inject.Named;

import javax.inject.Named;
@@ -82,7 +83,8 @@ import dagger.Provides; 
@Module(includes = {

@Module(includes = {

        MediaModule.class,

        MediaModule.class,

        PowerModule.class,

        PowerModule.class,

        QSModule.class

        QSModule.class,

        VolumeModule.class

})

})

public abstract class SystemUIDefaultModule {

public abstract class SystemUIDefaultModule {

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ import com.android.systemui.util.sensors.SensorModule; 
import com.android.systemui.util.settings.SettingsUtilModule;

import com.android.systemui.util.settings.SettingsUtilModule;

import com.android.systemui.util.time.SystemClock;

import com.android.systemui.util.time.SystemClock;

import com.android.systemui.util.time.SystemClockImpl;

import com.android.systemui.util.time.SystemClockImpl;

import com.android.systemui.volume.dagger.VolumeModule;

import com.android.systemui.wallet.dagger.WalletModule;

import com.android.systemui.wallet.dagger.WalletModule;

import com.android.systemui.wmshell.BubblesManager;

import com.android.systemui.wmshell.BubblesManager;

import com.android.wm.shell.bubbles.Bubbles;

import com.android.wm.shell.bubbles.Bubbles;
@@ -112,7 +111,6 @@ import dagger.Provides; 
            TunerModule.class,

            TunerModule.class,

            UserModule.class,

            UserModule.class,

            UtilModule.class,

            UtilModule.class,

            VolumeModule.class,

            WalletModule.class

            WalletModule.class

        },

        },

        subcomponents = {

        subcomponents = {

packages/SystemUI/src/com/android/systemui/tv/TvSystemUIModule.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ import com.android.systemui.statusbar.policy.IndividualSensorPrivacyControllerIm 
import com.android.systemui.statusbar.policy.SensorPrivacyController;

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

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

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

import com.android.systemui.statusbar.tv.notifications.TvNotificationHandler;

import com.android.systemui.statusbar.tv.notifications.TvNotificationHandler;

import com.android.systemui.volume.dagger.VolumeModule;





import javax.inject.Named;

import javax.inject.Named;
@@ -83,7 +84,8 @@ import dagger.Provides; 
 */

 */

@Module(includes = {

@Module(includes = {

            PowerModule.class,

            PowerModule.class,

            QSModule.class

            QSModule.class,

            VolumeModule.class,

        },

        },

        subcomponents = {

        subcomponents = {

        })

        })

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java

+3 −11
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.ActivityInfo;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.media.AudioManager;

import android.media.VolumePolicy;

import android.media.VolumePolicy;

import android.os.Bundle;

import android.os.Bundle;

import android.view.WindowManager.LayoutParams;

import android.view.WindowManager.LayoutParams;
@@ -84,7 +83,8 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna 
            DemoModeController demoModeController,

            DemoModeController demoModeController,

            PluginDependencyProvider pluginDependencyProvider,

            PluginDependencyProvider pluginDependencyProvider,

            ExtensionController extensionController,

            ExtensionController extensionController,

            TunerService tunerService) {

            TunerService tunerService,

            VolumeDialog volumeDialog) {

        mContext = context;

        mContext = context;

        mKeyguardViewMediator = keyguardViewMediator;

        mKeyguardViewMediator = keyguardViewMediator;

        mActivityStarter = activityStarter;

        mActivityStarter = activityStarter;
@@ -94,7 +94,7 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna 
        pluginDependencyProvider.allowPluginDependency(VolumeDialogController.class);

        pluginDependencyProvider.allowPluginDependency(VolumeDialogController.class);

        extensionController.newExtension(VolumeDialog.class)

        extensionController.newExtension(VolumeDialog.class)

                .withPlugin(VolumeDialog.class)

                .withPlugin(VolumeDialog.class)

                .withDefault(this::createDefault)

                .withDefault(() -> volumeDialog)

                .withCallback(dialog -> {

                .withCallback(dialog -> {

                    if (mDialog != null) {

                    if (mDialog != null) {

                        mDialog.destroy();

                        mDialog.destroy();
@@ -108,14 +108,6 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna 
        demoModeController.addCallback(this);

        demoModeController.addCallback(this);

    }

    }





    protected VolumeDialog createDefault() {

        VolumeDialogImpl impl = new VolumeDialogImpl(mContext);

        impl.setStreamImportant(AudioManager.STREAM_SYSTEM, false);

        impl.setAutomute(true);

        impl.setSilentMode(false);

        return impl;

    }



    @Override

    @Override

    public void onTuningChanged(String key, String newValue) {

    public void onTuningChanged(String key, String newValue) {

        boolean volumeDownToEnterSilent = mVolumePolicy.volumeDownToEnterSilent;

        boolean volumeDownToEnterSilent = mVolumePolicy.volumeDownToEnterSilent;

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+22 −10
Original line number Original line Diff line number Diff line
@@ -106,7 +106,6 @@ import androidx.annotation.Nullable; 
import com.android.internal.graphics.drawable.BackgroundBlurDrawable;

import com.android.internal.graphics.drawable.BackgroundBlurDrawable;

import com.android.internal.view.RotationPolicy;

import com.android.internal.view.RotationPolicy;

import com.android.settingslib.Utils;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.Prefs;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.animation.Interpolators;

import com.android.systemui.animation.Interpolators;
@@ -235,6 +234,10 @@ public class VolumeDialogImpl implements VolumeDialog, 
    private final Object mSafetyWarningLock = new Object();

    private final Object mSafetyWarningLock = new Object();

    private final Accessibility mAccessibility = new Accessibility();

    private final Accessibility mAccessibility = new Accessibility();





    private final ConfigurationController mConfigurationController;

    private final MediaOutputDialogFactory mMediaOutputDialogFactory;

    private final ActivityStarter mActivityStarter;



    private boolean mShowing;

    private boolean mShowing;

    private boolean mShowA11yStream;

    private boolean mShowA11yStream;
@@ -256,14 +259,24 @@ public class VolumeDialogImpl implements VolumeDialog, 
    private Consumer<Boolean> mCrossWindowBlurEnabledListener;

    private Consumer<Boolean> mCrossWindowBlurEnabledListener;

    private BackgroundBlurDrawable mDialogRowsViewBackground;

    private BackgroundBlurDrawable mDialogRowsViewBackground;





    public VolumeDialogImpl(Context context) {

    public VolumeDialogImpl(

            Context context,

            VolumeDialogController volumeDialogController,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            DeviceProvisionedController deviceProvisionedController,

            ConfigurationController configurationController,

            MediaOutputDialogFactory mediaOutputDialogFactory,

            ActivityStarter activityStarter) {

        mContext =

        mContext =

                new ContextThemeWrapper(context, R.style.volume_dialog_theme);

                new ContextThemeWrapper(context, R.style.volume_dialog_theme);

        mController = Dependency.get(VolumeDialogController.class);

        mController = volumeDialogController;

        mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

        mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);

        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);

        mAccessibilityMgr = Dependency.get(AccessibilityManagerWrapper.class);

        mAccessibilityMgr = accessibilityManagerWrapper;

        mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);

        mDeviceProvisionedController = deviceProvisionedController;

        mConfigurationController = configurationController;

        mMediaOutputDialogFactory = mediaOutputDialogFactory;

        mActivityStarter = activityStarter;

        mShowActiveStreamOnly = showActiveStreamOnly();

        mShowActiveStreamOnly = showActiveStreamOnly();

        mHasSeenODICaptionsTooltip =

        mHasSeenODICaptionsTooltip =

                Prefs.getBoolean(context, Prefs.Key.HAS_SEEN_ODI_CAPTIONS_TOOLTIP, false);

                Prefs.getBoolean(context, Prefs.Key.HAS_SEEN_ODI_CAPTIONS_TOOLTIP, false);
@@ -306,14 +319,14 @@ public class VolumeDialogImpl implements VolumeDialog, 
        mController.addCallback(mControllerCallbackH, mHandler);

        mController.addCallback(mControllerCallbackH, mHandler);

        mController.getState();

        mController.getState();





        Dependency.get(ConfigurationController.class).addCallback(this);

        mConfigurationController.addCallback(this);

    }

    }





    @Override

    @Override

    public void destroy() {

    public void destroy() {

        mController.removeCallback(mControllerCallbackH);

        mController.removeCallback(mControllerCallbackH);

        mHandler.removeCallbacksAndMessages(null);

        mHandler.removeCallbacksAndMessages(null);

        Dependency.get(ConfigurationController.class).removeCallback(this);

        mConfigurationController.removeCallback(this);

    }

    }





    @Override

    @Override
@@ -1017,9 +1030,8 @@ public class VolumeDialogImpl implements VolumeDialog, 
                Events.writeEvent(Events.EVENT_SETTINGS_CLICK);

                Events.writeEvent(Events.EVENT_SETTINGS_CLICK);

                Intent intent = new Intent(Settings.Panel.ACTION_VOLUME);

                Intent intent = new Intent(Settings.Panel.ACTION_VOLUME);

                dismissH(DISMISS_REASON_SETTINGS_CLICKED);

                dismissH(DISMISS_REASON_SETTINGS_CLICKED);

                Dependency.get(MediaOutputDialogFactory.class).dismiss();

                mMediaOutputDialogFactory.dismiss();

                Dependency.get(ActivityStarter.class).startActivity(intent,

                mActivityStarter.startActivity(intent, true /* dismissShade */);

                        true /* dismissShade */);

            });

            });

        }

        }

    }

    }