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

Commit ad723390 authored by Rohan Shah's avatar Rohan Shah Committed by Android (Google) Code Review
Browse files

Merge "Organize notification classes in row/stack"

parents 2ed17e50 20790b89

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

+1 −1
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.Dependency.DependencyProvider;

import com.android.systemui.car.CarNotificationEntryManager;

import com.android.systemui.statusbar.NotificationEntryManager;

import com.android.systemui.statusbar.car.CarFacetButtonController;

import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;

import com.android.systemui.statusbar.car.hvac.HvacController;

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

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



/**

packages/SystemUI/res/layout/app_ops_info.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    limitations under the License.

-->



<com.android.systemui.statusbar.AppOpsInfo

<com.android.systemui.statusbar.notification.row.AppOpsInfo

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -88,4 +88,4 @@ 
            android:layout_marginEnd="-8dp"

            style="@style/TextAppearance.NotificationInfo.Button"/>

    </LinearLayout>

</com.android.systemui.statusbar.AppOpsInfo>
 
</com.android.systemui.statusbar.notification.row.AppOpsInfo>

packages/SystemUI/res/layout/hybrid_notification.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License

  -->



<com.android.systemui.statusbar.notification.HybridNotificationView

<com.android.systemui.statusbar.notification.row.HybridNotificationView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -35,4 +35,4 @@ 
        android:singleLine="true"

        style="?attr/hybridNotificationTextStyle"

    />

</com.android.systemui.statusbar.notification.HybridNotificationView>
 
 No newline at end of file
 
</com.android.systemui.statusbar.notification.row.HybridNotificationView>
 
 No newline at end of file

packages/SystemUI/res/layout/notification_children_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License

  -->



<com.android.systemui.statusbar.stack.NotificationChildrenContainer

<com.android.systemui.statusbar.notification.stack.NotificationChildrenContainer

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content" />

packages/SystemUI/res/layout/notification_guts.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    limitations under the License.

-->



<com.android.systemui.statusbar.NotificationGuts

<com.android.systemui.statusbar.notification.row.NotificationGuts

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"