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

Commit f9e5a8f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move EmptyShadeView to its own directory" into main

parents 1765744f 2ecace1d

packages/SystemUI/res/layout/status_bar_no_notifications.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  -->



<!-- Extends Framelayout -->

<com.android.systemui.statusbar.EmptyShadeView

<com.android.systemui.statusbar.notification.emptyshade.ui.view.EmptyShadeView

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -46,4 +46,4 @@ 
                android:textAppearance="?android:attr/textAppearanceButton"

                android:text="@string/unlock_to_see_notif_text"/>

    </LinearLayout>

</com.android.systemui.statusbar.EmptyShadeView>
 
</com.android.systemui.statusbar.notification.emptyshade.ui.view.EmptyShadeView>

packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java→packages/SystemUI/src/com/android/systemui/statusbar/notification/emptyshade/ui/view/EmptyShadeView.java

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

 * Copyright (C) 2014 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;

package com.android.systemui.statusbar.notification.emptyshade.ui.view;



import android.annotation.ColorInt;

import android.annotation.DrawableRes;

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ import com.android.systemui.res.R; 
import com.android.systemui.scene.shared.flag.SceneContainerFlag;

import com.android.systemui.shade.QSHeaderBoundsProvider;

import com.android.systemui.shade.TouchLogger;

import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.NotificationShelf;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.notification.ColorUpdateLogger;
@@ -106,6 +105,7 @@ import com.android.systemui.statusbar.notification.NotificationUtils; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.notification.emptyshade.ui.view.EmptyShadeView;

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor;

import com.android.systemui.statusbar.notification.footer.ui.view.FooterView;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

+1 −1
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ import com.android.systemui.animation.ShadeInterpolation; 
import com.android.systemui.res.R;

import com.android.systemui.scene.shared.flag.SceneContainerFlag;

import com.android.systemui.shade.transition.LargeScreenShadeInterpolator;

import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.NotificationShelf;

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

import com.android.systemui.statusbar.notification.emptyshade.ui.view.EmptyShadeView;

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor;

import com.android.systemui.statusbar.notification.footer.ui.view.FooterView;

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

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java

+1 −1
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ import com.android.systemui.res.R; 
import com.android.systemui.shade.QSHeaderBoundsProvider;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.transition.LargeScreenShadeInterpolator;

import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.NotificationShelf;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.notification.emptyshade.ui.view.EmptyShadeView;

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor;

import com.android.systemui.statusbar.notification.footer.ui.view.FooterView;

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