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

Commit 94fa137d authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Move HeadsUp* files into statusbar/notification" into main

parents f5a84047 de068cc7

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import com.android.systemui.statusbar.notification.collection.render.GroupMember 
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun

import com.android.systemui.statusbar.phone.ConfigurationControllerImpl

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone

import com.android.systemui.statusbar.notification.HeadsUpManagerPhone

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.testKosmos

import com.android.systemui.util.concurrency.DelayableExecutor

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ import com.android.systemui.statusbar.phone.BounceInterpolator; 
import com.android.systemui.statusbar.phone.CentralSurfaces;

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

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

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java→packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpManagerPhone.java

+4 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 * 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar.phone;

package com.android.systemui.statusbar.notification;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -47,6 +47,8 @@ import com.android.systemui.statusbar.notification.data.repository.HeadsUpReposi 
import com.android.systemui.statusbar.notification.data.repository.HeadsUpRowRepository;

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

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun;

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpNotificationViewControllerEmptyImpl.kt→packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpNotificationViewControllerEmptyImpl.kt

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

 */



package com.android.systemui.statusbar.phone

package com.android.systemui.statusbar.notification



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

import com.android.systemui.statusbar.phone.HeadsUpTouchHelper.HeadsUpNotificationViewController

import com.android.systemui.statusbar.notification.HeadsUpTouchHelper.HeadsUpNotificationViewController



/** Empty impl of [HeadsUpNotificationViewController] for use with Scene Container */

class HeadsUpNotificationViewControllerEmptyImpl : HeadsUpNotificationViewController {

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java→packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpTouchHelper.java

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 * 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.
@@ -11,10 +11,10 @@ 
 * 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

 * limitations under the License.

 */



package com.android.systemui.statusbar.phone;

package com.android.systemui.statusbar.notification;



import android.content.Context;

import android.os.RemoteException;