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

Commit 873dfb5f authored by Liana Kazanova's avatar Liana Kazanova Committed by Beth Thibodeau
Browse files

Revert "Add animated volume icon when playing media on the device" 

Revert submission 27671481-VolumePanel_dialog_icon

Reason for revert: Culprit - http://b/345735409
Reverted changes: /q/submissionid:27671481-VolumePanel_dialog_icon

Change-Id: I8a425f5017048d0d6bdaa9c8c3fe287de5ffe1cd
parent 1903b53b

packages/SystemUI/res/drawable/audio_bars_playing.xml

deleted100644 → 0
+0 −457

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/layout/volume_dialog.xml

+7 −7
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:id="@+id/volume_dialog_container"

    android:layout_width="wrap_content"
@@ -94,18 +96,16 @@ 
                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"

                    android:paddingBottom="@dimen/volume_dialog_ringer_rows_padding"

                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">



                    <com.android.keyguard.AlphaOptimizedImageButton

                        android:id="@+id/settings"

                        android:src="@drawable/horizontal_ellipsis"

                        android:layout_width="@dimen/volume_dialog_tap_target_size"

                        android:layout_height="@dimen/volume_dialog_tap_target_size"

                        android:layout_gravity="center"

                        android:background="@drawable/ripple_drawable_20dp"

                        android:contentDescription="@string/accessibility_volume_settings"

                        android:scaleType="centerInside"

                        android:soundEffectsEnabled="false"

                        android:src="@drawable/horizontal_ellipsis"

                        android:tint="?androidprv:attr/colorAccent" />

                        android:background="@drawable/ripple_drawable_20dp"

                        android:tint="?androidprv:attr/colorAccent"

                        android:soundEffectsEnabled="false" />

                </FrameLayout>

            </LinearLayout>

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

+0 −6
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ import com.android.systemui.util.settings.SecureSettings; 
import com.android.systemui.volume.domain.interactor.VolumeDialogInteractor;

import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor;

import com.android.systemui.volume.panel.shared.flag.VolumePanelFlag;

import com.android.systemui.volume.ui.binder.VolumeDialogMenuIconBinder;

import com.android.systemui.volume.ui.navigation.VolumeNavigator;



import dagger.Lazy;
@@ -314,7 +313,6 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
    private int mDialogTimeoutMillis;

    private final VibratorHelper mVibratorHelper;

    private final com.android.systemui.util.time.SystemClock mSystemClock;

    private final VolumeDialogMenuIconBinder mVolumeDialogMenuIconBinder;

    private final VolumePanelFlag mVolumePanelFlag;

    private final VolumeDialogInteractor mInteractor;
@@ -336,7 +334,6 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
            DumpManager dumpManager,

            Lazy<SecureSettings> secureSettings,

            VibratorHelper vibratorHelper,

            VolumeDialogMenuIconBinder volumeDialogMenuIconBinder,

            com.android.systemui.util.time.SystemClock systemClock,

            VolumeDialogInteractor interactor) {

        mContext =
@@ -370,7 +367,6 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
        mVolumePanelNavigationInteractor = volumePanelNavigationInteractor;

        mVolumeNavigator = volumeNavigator;

        mSecureSettings = secureSettings;

        mVolumeDialogMenuIconBinder = volumeDialogMenuIconBinder;

        mDialogTimeoutMillis = DIALOG_TIMEOUT_MILLIS;

        mVolumePanelFlag = volumePanelFlag;

        mInteractor = interactor;
@@ -448,7 +444,6 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
        if (mDevicePostureController != null) {

            mDevicePostureController.removeCallback(mDevicePostureControllerCallback);

        }

        mVolumeDialogMenuIconBinder.destroy();

    }



    @Override
@@ -684,7 +679,6 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 


        mSettingsView = mDialog.findViewById(R.id.settings_container);

        mSettingsIcon = mDialog.findViewById(R.id.settings);

        mVolumeDialogMenuIconBinder.bind(mSettingsIcon);



        if (mRows.isEmpty()) {

            if (!AudioSystem.isSingleVolume(mContext)) {

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogModule.kt

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.volume



import com.android.systemui.volume.panel.shared.flag.VolumePanelFlag

import com.android.systemui.volume.ui.viewmodel.AnimatedVolumeMenuIconViewModel

import com.android.systemui.volume.ui.viewmodel.StaticVolumeMenuIconViewModel

import com.android.systemui.volume.ui.viewmodel.VolumeMenuIconViewModel

import dagger.Lazy

import dagger.Module

import dagger.Provides



@Module

interface VolumeDialogModule {



    companion object {



        @Provides

        fun provideVolumeMenuIconViewModel(

            volumePanelFlag: VolumePanelFlag,

            static: Lazy<StaticVolumeMenuIconViewModel>,

            animated: Lazy<AnimatedVolumeMenuIconViewModel>,

        ): VolumeMenuIconViewModel {

            return if (volumePanelFlag.canUseNewVolumePanel()) {

                    animated

                } else {

                    static

                }

                .get()

        }

    }

}

packages/SystemUI/src/com/android/systemui/volume/dagger/VolumeModule.java

+0 −5
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.volume.CsdWarningDialog; 
import com.android.systemui.volume.VolumeComponent;

import com.android.systemui.volume.VolumeDialogComponent;

import com.android.systemui.volume.VolumeDialogImpl;

import com.android.systemui.volume.VolumeDialogModule;

import com.android.systemui.volume.VolumePanelDialogReceiver;

import com.android.systemui.volume.VolumeUI;

import com.android.systemui.volume.domain.interactor.VolumeDialogInteractor;
@@ -46,7 +45,6 @@ import com.android.systemui.volume.domain.interactor.VolumePanelNavigationIntera 
import com.android.systemui.volume.panel.dagger.VolumePanelComponent;

import com.android.systemui.volume.panel.dagger.factory.VolumePanelComponentFactory;

import com.android.systemui.volume.panel.shared.flag.VolumePanelFlag;

import com.android.systemui.volume.ui.binder.VolumeDialogMenuIconBinder;

import com.android.systemui.volume.ui.navigation.VolumeNavigator;



import dagger.Binds;
@@ -65,7 +63,6 @@ import dagger.multibindings.IntoSet; 
                CaptioningModule.class,

                MediaDevicesModule.class,

                SpatializerModule.class,

                VolumeDialogModule.class,

        },

        subcomponents = {

                VolumePanelComponent.class
@@ -118,7 +115,6 @@ public interface VolumeModule { 
            DumpManager dumpManager,

            Lazy<SecureSettings> secureSettings,

            VibratorHelper vibratorHelper,

            VolumeDialogMenuIconBinder volumeDialogMenuIconBinder,

            SystemClock systemClock,

            VolumeDialogInteractor interactor) {

        VolumeDialogImpl impl = new VolumeDialogImpl(
@@ -139,7 +135,6 @@ public interface VolumeModule { 
                dumpManager,

                secureSettings,

                vibratorHelper,

                volumeDialogMenuIconBinder,

                systemClock,

                interactor);

        impl.setStreamImportant(AudioManager.STREAM_SYSTEM, false);