Merge changes from topic "b190746471-status-bar-refactor" into sc-v2-dev am: 3921366de7 (2b1ea1d8) · Commits · e / os / android_frameworks_base

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

+19 −0

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

		import android.app.INotificationManager;
		import android.content.Context;
		import android.view.LayoutInflater;

		import androidx.annotation.Nullable;

		@@ -26,6 +27,7 @@ import com.android.keyguard.clock.ClockModule;
		import com.android.keyguard.dagger.KeyguardBouncerComponent;
		import com.android.systemui.BootCompleteCache;
		import com.android.systemui.BootCompleteCacheImpl;
		import com.android.systemui.R;
		import com.android.systemui.SystemUIFactory;
		import com.android.systemui.appops.dagger.AppOpsModule;
		import com.android.systemui.assist.AssistModule;
		@@ -61,6 +63,7 @@ import com.android.systemui.statusbar.notification.row.dagger.NotificationRowCom
		import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent;
		import com.android.systemui.statusbar.phone.ShadeController;
		import com.android.systemui.statusbar.phone.StatusBar;
		import com.android.systemui.statusbar.phone.StatusBarWindowView;
		import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.HeadsUpManager;
		@@ -69,6 +72,7 @@ import com.android.systemui.statusbar.policy.dagger.SmartRepliesInflationModule;
		import com.android.systemui.statusbar.policy.dagger.StatusBarPolicyModule;
		import com.android.systemui.tuner.dagger.TunerModule;
		import com.android.systemui.user.UserModule;
		import com.android.systemui.util.InjectionInflationController;
		import com.android.systemui.util.concurrency.SysUIConcurrencyModule;
		import com.android.systemui.util.dagger.UtilModule;
		import com.android.systemui.util.sensors.SensorModule;
		@@ -198,4 +202,19 @@ public abstract class SystemUIModule {
		groupManager, entryManager, notifPipeline, sysUiState, featureFlags, dumpManager,
		sysuiMainExecutor));
		}

		@Provides
		@SysUISingleton
		static StatusBarWindowView providesStatusBarWindowView(Context context,
		InjectionInflationController injectionInflationController) {
		StatusBarWindowView view =
		(StatusBarWindowView) injectionInflationController.injectable(
		LayoutInflater.from(context)).inflate(R.layout.super_status_bar,
		/* root= */ null);
		if (view == null) {
		throw new IllegalStateException(
		"R.layout.super_status_bar could not be properly inflated");
		}
		return view;
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/SuperStatusBarViewFactory.java

deleted100644 → 0

+0 −139

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.statusbar;

		import android.content.Context;
		import android.view.LayoutInflater;
		import android.view.ViewGroup;

		import com.android.systemui.R;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent;
		import com.android.systemui.statusbar.phone.NotificationPanelView;
		import com.android.systemui.statusbar.phone.NotificationShadeWindowView;
		import com.android.systemui.statusbar.phone.StatusBarWindowView;
		import com.android.systemui.util.InjectionInflationController;

		import javax.inject.Inject;

		/**
		* Creates a single instance of super_status_bar and super_notification_shade that can be shared
		* across various system ui objects.
		*/
		@SysUISingleton
		public class SuperStatusBarViewFactory {

		private final Context mContext;
		private final InjectionInflationController mInjectionInflationController;
		private final NotificationShelfComponent.Builder mNotificationShelfComponentBuilder;

		private NotificationShadeWindowView mNotificationShadeWindowView;
		private StatusBarWindowView mStatusBarWindowView;
		private NotificationShelfController mNotificationShelfController;

		@Inject
		public SuperStatusBarViewFactory(Context context,
		InjectionInflationController injectionInflationController,
		NotificationShelfComponent.Builder notificationShelfComponentBuilder) {
		mContext = context;
		mInjectionInflationController = injectionInflationController;
		mNotificationShelfComponentBuilder = notificationShelfComponentBuilder;
		}

		/**
		* Gets the inflated {@link NotificationShadeWindowView} from
		* {@link R.layout#super_notification_shade}.
		* Returns a cached instance, if it has already been inflated.
		*/
		public NotificationShadeWindowView getNotificationShadeWindowView() {
		if (mNotificationShadeWindowView != null) {
		return mNotificationShadeWindowView;
		}

		mNotificationShadeWindowView = (NotificationShadeWindowView)
		mInjectionInflationController.injectable(
		LayoutInflater.from(mContext)).inflate(R.layout.super_notification_shade,
		/* root= */ null);
		if (mNotificationShadeWindowView == null) {
		throw new IllegalStateException(
		"R.layout.super_notification_shade could not be properly inflated");
		}

		return mNotificationShadeWindowView;
		}

		/**
		* Gets the inflated {@link StatusBarWindowView} from {@link R.layout#super_status_bar}.
		* Returns a cached instance, if it has already been inflated.
		*/
		public StatusBarWindowView getStatusBarWindowView() {
		if (mStatusBarWindowView != null) {
		return mStatusBarWindowView;
		}

		mStatusBarWindowView =
		(StatusBarWindowView) mInjectionInflationController.injectable(
		LayoutInflater.from(mContext)).inflate(R.layout.super_status_bar,
		/* root= */ null);
		if (mStatusBarWindowView == null) {
		throw new IllegalStateException(
		"R.layout.super_status_bar could not be properly inflated");
		}
		return mStatusBarWindowView;
		}

		/**
		* Gets the inflated {@link NotificationShelf} from
		* {@link R.layout#status_bar_notification_shelf}.
		* Returns a cached instance, if it has already been inflated.
		*
		* @param container the expected container to hold the {@link NotificationShelf}. The view
		* isn't immediately attached, but the layout params of this view is used
		* during inflation.
		*/
		public NotificationShelfController getNotificationShelfController(ViewGroup container) {
		if (mNotificationShelfController != null) {
		return mNotificationShelfController;
		}

		NotificationShelf view = (NotificationShelf) LayoutInflater.from(mContext)
		.inflate(R.layout.status_bar_notification_shelf, container, /* attachToRoot= */
		false);

		if (view == null) {
		throw new IllegalStateException(
		"R.layout.status_bar_notification_shelf could not be properly inflated");
		}

		NotificationShelfComponent component = mNotificationShelfComponentBuilder
		.notificationShelf(view)
		.build();
		mNotificationShelfController = component.getNotificationShelfController();
		mNotificationShelfController.init();

		return mNotificationShelfController;
		}

		public NotificationPanelView getNotificationPanelView() {
		NotificationShadeWindowView notificationShadeWindowView = getNotificationShadeWindowView();
		if (notificationShadeWindowView == null) {
		return null;
		}

		return mNotificationShadeWindowView.findViewById(R.id.notification_panel);
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt

+1 −6

Original line number	Diff line number	Diff line
		@@ -24,13 +24,10 @@ import android.view.View
		import android.view.ViewGroup.LayoutParams.MATCH_PARENT
		import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
		import android.widget.FrameLayout

		import com.android.systemui.R
		import com.android.systemui.statusbar.SuperStatusBarViewFactory
		import com.android.systemui.statusbar.phone.StatusBarLocationPublisher
		import com.android.systemui.statusbar.phone.StatusBarWindowController
		import com.android.systemui.statusbar.phone.StatusBarWindowView

		import javax.inject.Inject

		/**
		@@ -38,7 +35,7 @@ import javax.inject.Inject
		*/
		class SystemEventChipAnimationController @Inject constructor(
		private val context: Context,
		private val statusBarViewFactory: SuperStatusBarViewFactory,
		private val statusBarWindowView: StatusBarWindowView,
		private val statusBarWindowController: StatusBarWindowController,
		private val locationPublisher: StatusBarLocationPublisher
		) : SystemStatusChipAnimationCallback {
		@@ -51,7 +48,6 @@ class SystemEventChipAnimationController @Inject constructor(

		private lateinit var animationWindowView: FrameLayout
		private lateinit var animationDotView: View
		private lateinit var statusBarWindowView: StatusBarWindowView
		private var currentAnimatedView: View? = null

		// TODO: move to dagger
		@@ -125,7 +121,6 @@ class SystemEventChipAnimationController @Inject constructor(

		private fun init() {
		initialized = true
		statusBarWindowView = statusBarViewFactory.statusBarWindowView
		animationWindowView = LayoutInflater.from(context)
		.inflate(R.layout.system_event_animation_window, null) as FrameLayout
		animationDotView = animationWindowView.findViewById(R.id.dot_view)

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

+5 −7

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.NotificationShadeDepthController;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.PulseExpansionHandler;
		import com.android.systemui.statusbar.SuperStatusBarViewFactory;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		import com.android.systemui.statusbar.notification.DynamicPrivacyController;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		@@ -106,7 +105,7 @@ public class NotificationShadeWindowViewController {
		private boolean mExpandingBelowNotch;
		private final DockManager mDockManager;
		private final NotificationPanelViewController mNotificationPanelViewController;
		private final SuperStatusBarViewFactory mStatusBarViewFactory;
		private final StatusBarWindowView mStatusBarWindowView;

		// Used for determining view / touch intersection
		private int[] mTempLocation = new int[2];
		@@ -136,7 +135,7 @@ public class NotificationShadeWindowViewController {
		NotificationShadeDepthController depthController,
		NotificationShadeWindowView notificationShadeWindowView,
		NotificationPanelViewController notificationPanelViewController,
		SuperStatusBarViewFactory statusBarViewFactory,
		StatusBarWindowView statusBarWindowView,
		NotificationStackScrollLayoutController notificationStackScrollLayoutController,
		StatusBarKeyguardViewManager statusBarKeyguardViewManager) {
		mInjectionInflationController = injectionInflationController;
		@@ -160,7 +159,7 @@ public class NotificationShadeWindowViewController {
		mDockManager = dockManager;
		mNotificationPanelViewController = notificationPanelViewController;
		mDepthController = depthController;
		mStatusBarViewFactory = statusBarViewFactory;
		mStatusBarWindowView = statusBarWindowView;
		mNotificationStackScrollLayoutController = notificationStackScrollLayoutController;
		mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

		@@ -477,11 +476,10 @@ public class NotificationShadeWindowViewController {

		public void setStatusBarView(PhoneStatusBarView statusBarView) {
		mStatusBarView = statusBarView;
		if (statusBarView != null && mStatusBarViewFactory != null) {
		if (statusBarView != null) {
		mBarTransitions = new PhoneStatusBarTransitions(
		statusBarView,
		mStatusBarViewFactory.getStatusBarWindowView()
		.findViewById(R.id.status_bar_container));
		mStatusBarWindowView.findViewById(R.id.status_bar_container));
		}
		}

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

+15 −26

Original line number	Diff line number	Diff line
		@@ -194,7 +194,6 @@ import com.android.systemui.statusbar.OperatorNameViewController;
		import com.android.systemui.statusbar.PowerButtonReveal;
		import com.android.systemui.statusbar.PulseExpansionHandler;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.SuperStatusBarViewFactory;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;
		import com.android.systemui.statusbar.notification.DynamicPrivacyController;
		@@ -228,11 +227,11 @@ import com.android.systemui.statusbar.policy.UserInfoControllerImpl;
		import com.android.systemui.statusbar.policy.UserSwitcherController;
		import com.android.systemui.tuner.TunerService;
		import com.android.systemui.unfold.UnfoldLightRevealOverlayAnimation;
		import com.android.systemui.unfold.config.UnfoldTransitionConfig;
		import com.android.systemui.util.concurrency.DelayableExecutor;
		import com.android.systemui.util.concurrency.MessageRouter;
		import com.android.systemui.volume.VolumeComponent;
		import com.android.systemui.wmshell.BubblesManager;
		import com.android.systemui.unfold.config.UnfoldTransitionConfig;
		import com.android.wm.shell.bubbles.Bubbles;
		import com.android.wm.shell.legacysplitscreen.LegacySplitScreen;
		import com.android.wm.shell.startingsurface.SplashscreenContentDrawer;
		@@ -248,7 +247,6 @@ import java.util.Optional;
		import java.util.concurrent.Executor;

		import javax.inject.Named;
		import javax.inject.Provider;

		import dagger.Lazy;

		@@ -459,7 +457,6 @@ public class StatusBar extends SystemUI implements
		private final Point mCurrentDisplaySize = new Point();

		protected NotificationShadeWindowView mNotificationShadeWindowView;
		protected StatusBarWindowView mPhoneStatusBarWindow;
		protected PhoneStatusBarView mStatusBarView;
		private PhoneStatusBarViewController mPhoneStatusBarViewController;
		private AuthRippleController mAuthRippleController;
		@@ -491,13 +488,13 @@ public class StatusBar extends SystemUI implements
		protected NotificationShadeWindowViewController mNotificationShadeWindowViewController;
		private final DozeParameters mDozeParameters;
		private final Lazy<BiometricUnlockController> mBiometricUnlockControllerLazy;
		private final Provider<StatusBarComponent.Builder> mStatusBarComponentBuilder;
		private final StatusBarComponent.Factory mStatusBarComponentFactory;
		private final PluginManager mPluginManager;
		private final Optional<LegacySplitScreen> mSplitScreenOptional;
		private final StatusBarNotificationActivityStarter.Builder
		mStatusBarNotificationActivityStarterBuilder;
		private final ShadeController mShadeController;
		private final SuperStatusBarViewFactory mSuperStatusBarViewFactory;
		private final StatusBarWindowView mStatusBarWindowView;
		private final LightsOutNotifController mLightsOutNotifController;
		private final InitController mInitController;

		@@ -744,14 +741,14 @@ public class StatusBar extends SystemUI implements
		DozeScrimController dozeScrimController,
		VolumeComponent volumeComponent,
		CommandQueue commandQueue,
		Provider<StatusBarComponent.Builder> statusBarComponentBuilder,
		StatusBarComponent.Factory statusBarComponentFactory,
		PluginManager pluginManager,
		Optional<LegacySplitScreen> splitScreenOptional,
		LightsOutNotifController lightsOutNotifController,
		StatusBarNotificationActivityStarter.Builder
		statusBarNotificationActivityStarterBuilder,
		ShadeController shadeController,
		SuperStatusBarViewFactory superStatusBarViewFactory,
		StatusBarWindowView statusBarWindowView,
		StatusBarKeyguardViewManager statusBarKeyguardViewManager,
		ViewMediatorCallback viewMediatorCallback,
		InitController initController,
		@@ -841,12 +838,12 @@ public class StatusBar extends SystemUI implements
		mNotificationShadeDepthControllerLazy = notificationShadeDepthControllerLazy;
		mVolumeComponent = volumeComponent;
		mCommandQueue = commandQueue;
		mStatusBarComponentBuilder = statusBarComponentBuilder;
		mStatusBarComponentFactory = statusBarComponentFactory;
		mPluginManager = pluginManager;
		mSplitScreenOptional = splitScreenOptional;
		mStatusBarNotificationActivityStarterBuilder = statusBarNotificationActivityStarterBuilder;
		mShadeController = shadeController;
		mSuperStatusBarViewFactory = superStatusBarViewFactory;
		mStatusBarWindowView = statusBarWindowView;
		mLightsOutNotifController = lightsOutNotifController;
		mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;
		mKeyguardViewMediatorCallback = viewMediatorCallback;
		@@ -1108,14 +1105,10 @@ public class StatusBar extends SystemUI implements

		// TODO: Deal with the ugliness that comes from having some of the statusbar broken out
		// into fragments, but the rest here, it leaves some awkward lifecycle and whatnot.
		mStackScrollerController =
		mNotificationPanelViewController.getNotificationStackScrollLayoutController();
		mStackScroller = mStackScrollerController.getView();
		NotificationListContainer notifListContainer =
		mStackScrollerController.getNotificationListContainer();
		mNotificationLogger.setUpWithContainer(notifListContainer);

		inflateShelf();
		mNotificationIconAreaController.setupShelf(mNotificationShelfController);
		mNotificationPanelViewController.addExpansionListener(mWakeUpCoordinator);
		mNotificationPanelViewController.addExpansionListener(
		@@ -1124,7 +1117,7 @@ public class StatusBar extends SystemUI implements
		// Allow plugins to reference DarkIconDispatcher and StatusBarStateController
		mPluginDependencyProvider.allowPluginDependency(DarkIconDispatcher.class);
		mPluginDependencyProvider.allowPluginDependency(StatusBarStateController.class);
		FragmentHostManager.get(mPhoneStatusBarWindow)
		FragmentHostManager.get(mStatusBarWindowView)
		.addTagListener(CollapsedStatusBarFragment.TAG, (tag, fragment) -> {
		CollapsedStatusBarFragment statusBarFragment =
		(CollapsedStatusBarFragment) fragment;
		@@ -1543,24 +1536,20 @@ public class StatusBar extends SystemUI implements
		};
		}

		private void inflateShelf() {
		mNotificationShelfController = mSuperStatusBarViewFactory
		.getNotificationShelfController(mStackScroller);
		}

		private void inflateStatusBarWindow() {
		mNotificationShadeWindowView = mSuperStatusBarViewFactory.getNotificationShadeWindowView();
		StatusBarComponent statusBarComponent = mStatusBarComponentBuilder.get()
		.statusBarWindowView(mNotificationShadeWindowView).build();
		StatusBarComponent statusBarComponent = mStatusBarComponentFactory.create();
		mNotificationShadeWindowView = statusBarComponent.getNotificationShadeWindowView();
		mNotificationShadeWindowViewController = statusBarComponent
		.getNotificationShadeWindowViewController();
		mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);
		mNotificationShadeWindowViewController.setupExpandedStatusBar();
		mStatusBarWindowController = statusBarComponent.getStatusBarWindowController();
		mPhoneStatusBarWindow = mSuperStatusBarViewFactory.getStatusBarWindowView();
		mNotificationPanelViewController = statusBarComponent.getNotificationPanelViewController();
		statusBarComponent.getLockIconViewController().init();
		mStackScrollerController = statusBarComponent.getNotificationStackScrollLayoutController();
		mStackScroller = mStackScrollerController.getView();

		mNotificationShelfController = statusBarComponent.getNotificationShelfController();
		mAuthRippleController = statusBarComponent.getAuthRippleController();
		mAuthRippleController.init();

		@@ -1635,7 +1624,7 @@ public class StatusBar extends SystemUI implements
		}

		public StatusBarWindowView getStatusBarWindow() {
		return mPhoneStatusBarWindow;
		return mStatusBarWindowView;
		}

		public NotificationShadeWindowViewController getNotificationShadeWindowViewController() {
		@@ -2588,7 +2577,7 @@ public class StatusBar extends SystemUI implements
		private ActivityLaunchAnimator.Controller wrapAnimationController(
		ActivityLaunchAnimator.Controller animationController, boolean dismissShade) {
		View rootView = animationController.getLaunchContainer().getRootView();
		if (rootView == mSuperStatusBarViewFactory.getStatusBarWindowView()) {
		if (rootView == mStatusBarWindowView) {
		// We are animating a view in the status bar. We have to make sure that the status bar
		// window matches the full screen during the animation and that we are expanding the
		// view below the other status bar text.