Merge "Revert "Allow ongoing activity chips on dream to receive touch"" into main (bc7fe455) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/section/AmbientStatusBarSection.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -44,9 +44,7 @@ constructor(private val factory: AmbientStatusBarComponent.Factory) {
		) as AmbientStatusBarView)
		.apply {
		visibility = View.VISIBLE
		factory.create(this, touchInsetSession = null).getController().apply {
		init()
		}
		factory.create(this).getController().apply { init() }
		}
		},
		modifier = modifier.element(Communal.Elements.StatusBar),

packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewControllerTest.java

+0 −25

Original line number	Diff line number	Diff line
		@@ -36,17 +36,14 @@ import android.app.AlarmManager;
		import android.content.Context;
		import android.content.res.Resources;
		import android.hardware.SensorPrivacyManager;
		import android.platform.test.annotations.EnableFlags;
		import android.provider.Settings;
		import android.testing.TestableLooper;
		import android.view.View;

		import androidx.compose.ui.platform.ComposeView;
		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;

		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.ambient.statusbar.shared.flag.OngoingActivityChipsOnDream;
		import com.android.systemui.dreams.DreamOverlayNotificationCountProvider;
		import com.android.systemui.dreams.DreamOverlayStateController;
		import com.android.systemui.dreams.DreamOverlayStatusBarItemsProvider;
		@@ -65,7 +62,6 @@ import com.android.systemui.statusbar.policy.NextAlarmController;
		import com.android.systemui.statusbar.policy.ZenModeController;
		import com.android.systemui.statusbar.window.StatusBarWindowStateController;
		import com.android.systemui.statusbar.window.StatusBarWindowStateListener;
		import com.android.systemui.touch.TouchInsetManager;
		import com.android.systemui.util.time.DateFormatUtil;

		import org.junit.Before;
		@@ -89,8 +85,6 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase {
		private static final String NOTIFICATION_INDICATOR_FORMATTER_STRING =
		"{count, plural, =1 {# notification} other {# notifications}}";

		@Mock
		Context mContext;
		@Mock
		MockAmbientStatusBarView mView;
		@Mock
		@@ -125,8 +119,6 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase {
		AmbientStatusBarViewModel.Factory mAmbientStatusBarViewModelFactory;
		@Mock
		ConnectedDisplaysStatusBarNotificationIconViewStore.Factory mIconViewStoreFactory;
		@Mock
		TouchInsetManager.TouchInsetSession mTouchInsetSession;

		LogBuffer mLogBuffer = FakeLogBuffer.Factory.Companion.create();

		@@ -150,7 +142,6 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase {
		doCallRealMethod().when(mView).setVisibility(anyInt());
		doCallRealMethod().when(mView).getVisibility();
		when(mUserTracker.getUserId()).thenReturn(ActivityManager.getCurrentUser());
		when(mView.getContext()).thenReturn(mContext);

		mController = new AmbientStatusBarViewController(
		mView,
		@@ -171,7 +162,6 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase {
		mKosmos.getCommunalSceneInteractor(),
		mAmbientStatusBarViewModelFactory,
		mIconViewStoreFactory,
		mTouchInsetSession,
		mLogBuffer);
		mController.onInit();
		}
		@@ -352,7 +342,6 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase {
		mKosmos.getCommunalSceneInteractor(),
		mAmbientStatusBarViewModelFactory,
		mIconViewStoreFactory,
		mTouchInsetSession,
		mLogBuffer);
		controller.onViewAttached();
		verify(mView, never()).showIcon(
		@@ -607,20 +596,6 @@ public class AmbientStatusBarViewControllerTest extends SysuiTestCase {
		verify(mStatusBarWindowStateController).removeListener(eq(listenerCaptor.getValue()));
		}

		@EnableFlags(OngoingActivityChipsOnDream.FLAG_NAME)
		@Test
		public void testAddAndRemoveOngoingActivityChipsViewFromTouchInsetSession() {
		final ComposeView ongoingActivityChipsView = Mockito.mock(ComposeView.class);
		when(mView.findViewById(R.id.dream_overlay_ongoing_activity_chips))
		.thenReturn(ongoingActivityChipsView);

		mController.onViewAttached();
		verify(mTouchInsetSession).addViewToTracking(ongoingActivityChipsView);

		mController.onViewDetached();
		verify(mTouchInsetSession).removeViewFromTracking(ongoingActivityChipsView);
		}

		private StatusBarWindowStateListener updateStatusBarWindowState(boolean show) {
		when(mStatusBarWindowStateController.windowIsShowing()).thenReturn(show);
		final ArgumentCaptor<StatusBarWindowStateListener>

packages/SystemUI/src/com/android/systemui/ambient/statusbar/dagger/AmbientStatusBarComponent.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.ambient.statusbar.dagger

		import com.android.systemui.ambient.statusbar.ui.AmbientStatusBarView
		import com.android.systemui.ambient.statusbar.ui.AmbientStatusBarViewController
		import com.android.systemui.touch.TouchInsetManager
		import dagger.BindsInstance
		import dagger.Subcomponent

		@@ -32,7 +31,6 @@ interface AmbientStatusBarComponent {
		interface Factory {
		fun create(
		@BindsInstance view: AmbientStatusBarView,
		@BindsInstance touchInsetSession: TouchInsetManager.TouchInsetSession?,
		): AmbientStatusBarComponent
		}

packages/SystemUI/src/com/android/systemui/ambient/statusbar/ui/AmbientStatusBarViewController.java

+6 −28

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import com.android.systemui.statusbar.policy.NextAlarmController;
		import com.android.systemui.statusbar.policy.ZenModeController;
		import com.android.systemui.statusbar.window.StatusBarWindowStateController;
		import com.android.systemui.statusbar.window.StatusBarWindowStateListener;
		import com.android.systemui.touch.TouchInsetManager;
		import com.android.systemui.util.ViewController;
		import com.android.systemui.util.time.DateFormatUtil;

		@@ -101,17 +100,12 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus
		private final ConnectedDisplaysStatusBarNotificationIconViewStore.Factory mIconViewStoreFactory;
		private final DreamLogger mLogger;

		@Nullable
		private final TouchInsetManager.TouchInsetSession mTouchInsetSession;

		private boolean mIsAttached;
		private boolean mCommunalVisible;

		// Whether dream entry animations are finished.
		private boolean mEntryAnimationsFinished = false;

		@Nullable private ComposeView mOngoingActivityChipsView = null;

		private final DreamOverlayStateController.Callback mDreamOverlayStateCallback =
		new DreamOverlayStateController.Callback() {
		@Override
		@@ -175,7 +169,6 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus
		CommunalSceneInteractor communalSceneInteractor,
		AmbientStatusBarViewModel.Factory ambientStatusBarViewModelFactory,
		ConnectedDisplaysStatusBarNotificationIconViewStore.Factory iconViewStoreFactory,
		@Nullable TouchInsetManager.TouchInsetSession touchInsetSession,
		@DreamLog LogBuffer logBuffer) {
		super(view);
		mResources = resources;
		@@ -195,7 +188,6 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus
		mCommunalSceneInteractor = communalSceneInteractor;
		mAmbientStatusBarViewModelFactory = ambientStatusBarViewModelFactory;
		mIconViewStoreFactory = iconViewStoreFactory;
		mTouchInsetSession = touchInsetSession;
		mLogger = new DreamLogger(logBuffer, TAG);
		}

		@@ -222,21 +214,13 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus
		mIsAttached = true;

		if (OngoingActivityChipsOnDream.isEnabled()) {
		mOngoingActivityChipsView =
		final ComposeView ongoingActivityChipsView =
		mView.findViewById(R.id.dream_overlay_ongoing_activity_chips);

		if (mOngoingActivityChipsView != null) {
		AmbientStatusBarViewBinder.bindOngoingActivityChipsView(
		getContext(),
		mOngoingActivityChipsView,
		ongoingActivityChipsView,
		mAmbientStatusBarViewModelFactory,
		mIconViewStoreFactory);

		// Allow the ongoing activity chips view to receive touch events.
		if (mTouchInsetSession != null) {
		mTouchInsetSession.addViewToTracking(mOngoingActivityChipsView);
		}
		}
		}

		mFlows.add(collectFlow(
		@@ -284,12 +268,6 @@ public class AmbientStatusBarViewController extends ViewController<AmbientStatus
		flow.dispose();
		}
		mFlows.clear();

		if (mTouchInsetSession != null && mOngoingActivityChipsView != null) {
		mTouchInsetSession.removeViewFromTracking(mOngoingActivityChipsView);
		mOngoingActivityChipsView = null;
		}

		mIsAttached = false;
		}

packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayModule.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -104,9 +104,8 @@ public abstract class DreamOverlayModule {
		@Provides
		@DreamOverlayComponent.DreamOverlayScope
		public static AmbientStatusBarViewController providesStatusBarViewController(
		AmbientStatusBarView view, AmbientStatusBarComponent.Factory factory,
		TouchInsetManager.TouchInsetSession touchInsetSession) {
		return factory.create(view, touchInsetSession).getController();
		AmbientStatusBarView view, AmbientStatusBarComponent.Factory factory) {
		return factory.create(view).getController();
		}

		/** */