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

Commit b8989dfe authored by Michael Mikhail's avatar Michael Mikhail
Browse files

Move NotificationMediaManager to media package 

Flag: EXEMPT CLEANUP
Fixes: 400678200
Test: Build.
Change-Id: I453f34cce8c98258c5d68a01c12f6ffa3198fb28
parent 6904a08f

packages/SystemUI/multivalentTests/src/com/android/systemui/ExpandHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import androidx.test.filters.SmallTest; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.animation.AnimatorTestRule;

import com.android.systemui.flags.FakeFeatureFlagsClassic;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.media.NotificationMediaManager;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.NotificationTestHelper;

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/KeyguardSliceProviderTest.java

+6 −4
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ import androidx.test.filters.SmallTest; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.SystemUIInitializerImpl;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.media.NotificationMediaManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.StatusBarState;

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

import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -177,7 +177,8 @@ public class KeyguardSliceProviderTest extends SysuiTestCase { 
    @Test

    public void schedulesAlarm12hBefore() {

        long in16Hours = System.currentTimeMillis() + TimeUnit.HOURS.toHours(16);

        AlarmManager.AlarmClockInfo alarmClockInfo = new AlarmManager.AlarmClockInfo(in16Hours, null);

        AlarmManager.AlarmClockInfo alarmClockInfo = new AlarmManager.AlarmClockInfo(in16Hours,

                null);

        mProvider.onNextAlarmChanged(alarmClockInfo);



        long twelveHours = TimeUnit.HOURS.toMillis(KeyguardSliceProvider.ALARM_VISIBILITY_HOURS);
@@ -189,7 +190,8 @@ public class KeyguardSliceProviderTest extends SysuiTestCase { 
    @Test

    public void updatingNextAlarmInvalidatesSlice() {

        long in16Hours = System.currentTimeMillis() + TimeUnit.HOURS.toHours(8);

        AlarmManager.AlarmClockInfo alarmClockInfo = new AlarmManager.AlarmClockInfo(in16Hours, null);

        AlarmManager.AlarmClockInfo alarmClockInfo = new AlarmManager.AlarmClockInfo(in16Hours,

                null);

        mProvider.onNextAlarmChanged(alarmClockInfo);



        verify(mContentResolver).notifyChange(eq(mProvider.getUri()), eq(null));

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationMediaManagerTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/media/NotificationMediaManagerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar

package com.android.systemui.media



import android.media.MediaMetadata

import android.media.session.MediaController

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ import com.android.systemui.TestableDependency; 
import com.android.systemui.classifier.FalsingManagerFake;

import com.android.systemui.flags.FakeFeatureFlagsClassic;

import com.android.systemui.flags.FeatureFlagsClassic;

import com.android.systemui.media.NotificationMediaManager;

import com.android.systemui.media.controls.util.MediaFeatureFlag;

import com.android.systemui.media.dialog.MediaOutputDialogManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.SmartReplyController;

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ import com.android.systemui.keyguard.shared.model.KeyguardState; 
import com.android.systemui.keyguard.shared.model.TransitionState;

import com.android.systemui.keyguard.shared.model.TransitionStep;

import com.android.systemui.log.SessionTracker;

import com.android.systemui.media.NotificationMediaManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.VibratorHelper;

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