Merge "Disable any fullScreenIntent launches in SystemUI." (bb305b37) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -20,9 +20,11 @@ import android.content.Context;

		import com.android.internal.widget.LockPatternUtils;
		import com.android.keyguard.ViewMediatorCallback;
		import com.android.systemui.car.CarNotificationEntryManager;
		import com.android.systemui.car.CarNotificationInterruptionStateProvider;
		import com.android.systemui.statusbar.car.CarFacetButtonController;
		import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.notification.NotificationEntryManager;
		import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.volume.CarVolumeDialogComponent;
		@@ -92,4 +94,12 @@ public class CarSystemUIFactory extends SystemUIFactory {
		public interface CarDependencyComponent {
		CarFacetButtonController getCarFacetButtonController();
		}

		/**
		* Use {@link CarNotificationEntryManager}, which does nothing when adding a notification.
		*/
		@Singleton
		public NotificationEntryManager provideNotificationEntryManager(Context context) {
		return new CarNotificationEntryManager(context);
		}
		}

0 → 100644

+39 −0

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.car;

		import android.content.Context;
		import android.service.notification.NotificationListenerService;
		import android.service.notification.StatusBarNotification;

		import com.android.systemui.statusbar.notification.NotificationEntryManager;

		/**
		* Car specific notification entry manager that does nothing when adding a notification.
		*
		* <p> This is because system UI notifications are disabled and we have a different implementation.
		* Please see {@link com.android.car.notification}.
		*/
		public class CarNotificationEntryManager extends NotificationEntryManager {
		public CarNotificationEntryManager(Context context) {
		super(context);
		}

		@Override
		public void addNotification(
		StatusBarNotification notification, NotificationListenerService.RankingMap ranking) {
		}
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -606,4 +606,8 @@ public class CarStatusBar extends StatusBar implements
		getComponent(NotificationsUI.class).toggleShowingCarNotifications();
		}

		@Override
		public void maybeEscalateHeadsUp() {
		// Never send full screen intent in car.
		}
		}