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

Commit 8a75e492 authored by Justin Weir's avatar Justin Weir
Browse files

Move most of the shade codebase into its own package 

Creates the package outside the 'phone' directory, since the shade is
not just on phones anymore and moves most of the shade code to it.
Moves the shade.transition package to it. Moves all related tests.
Expands a small amount of method scoping as necessary. Updates, adds,
and organizes imports as needed

Test: atest SystemUITests SystemUIGoogleTests
Fixes: 238333941
Change-Id: I721d35d4adb637f06501e92efe2d37421a3e84e5
parent a9a4f1e4

packages/SystemUI/res/layout/status_bar_expanded.xml

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->





<com.android.systemui.statusbar.phone.NotificationPanelView

<com.android.systemui.shade.NotificationPanelView

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

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

    android:id="@+id/notification_panel"
@@ -67,7 +67,7 @@ 


    </com.android.keyguard.LockIconView>



    <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer

    <com.android.systemui.shade.NotificationsQuickSettingsContainer

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="@integer/notification_panel_layout_gravity"
@@ -150,11 +150,11 @@ 
            android:text="@string/tap_again"

            android:visibility="gone"

        />

    </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer>

    </com.android.systemui.shade.NotificationsQuickSettingsContainer>



    <FrameLayout

        android:id="@+id/preview_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

    </FrameLayout>

</com.android.systemui.statusbar.phone.NotificationPanelView>
 
</com.android.systemui.shade.NotificationPanelView>

packages/SystemUI/res/layout/super_notification_shade.xml

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



<!-- This is the notification shade window. -->

<com.android.systemui.statusbar.phone.NotificationShadeWindowView

<com.android.systemui.shade.NotificationShadeWindowView

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

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

    android:layout_width="match_parent"
@@ -114,4 +114,4 @@ 
        android:importantForAccessibility="no"

        sysui:ignoreRightInset="true"

    />

</com.android.systemui.statusbar.phone.NotificationShadeWindowView>
 
</com.android.systemui.shade.NotificationShadeWindowView>

packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java

+1 −1
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ import android.view.ViewRootImpl; 
import androidx.annotation.Nullable;



import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.shade.NotificationPanelViewController;

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

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

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

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

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;



/**

packages/SystemUI/src/com/android/keyguard/dagger/KeyguardStatusBarViewComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
package com.android.keyguard.dagger;



import com.android.keyguard.KeyguardStatusViewController;

import com.android.systemui.shade.NotificationPanelViewController;

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

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

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



import dagger.BindsInstance;

import dagger.Subcomponent;

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.keyguard.dagger.KeyguardModule;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shade.NotificationPanelViewController;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationShadeDepthController;
@@ -131,7 +132,6 @@ import com.android.systemui.statusbar.phone.BiometricUnlockController; 
import com.android.systemui.statusbar.phone.CentralSurfaces;

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

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

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

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

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;

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