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

Commit 3ba165ab authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Android (Google) Code Review
Browse files

Merge "[Status Bar] Re-name StatusBar.java -> CentralSurfaces.java." into tm-dev

parents 0c0a88ea a3bcac58

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
    <!-- Needed for WallpaperManager.clear in ImageWallpaper.updateWallpaperLocked -->

    <uses-permission android:name="android.permission.SET_WALLPAPER"/>



    <!-- Needed for WallpaperManager.getWallpaperDimAmount in StatusBar.updateTheme -->

    <!-- Needed for WallpaperManager.getWallpaperDimAmount in CentralSurfaces.updateTheme -->

    <uses-permission android:name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/>



    <!-- Wifi Display -->

packages/SystemUI/proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


-keep class com.android.systemui.recents.OverviewProxyRecentsImpl

-keep class com.android.systemui.statusbar.car.CarStatusBar

-keep class com.android.systemui.statusbar.phone.StatusBar

-keep class com.android.systemui.statusbar.phone.CentralSurfaces

-keep class com.android.systemui.statusbar.tv.TvStatusBar

-keep class com.android.systemui.car.CarSystemUIFactory

-keep class com.android.systemui.SystemUIFactory

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

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import androidx.annotation.Nullable; 


import com.android.systemui.keyguard.KeyguardViewMediator;

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

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



/**
@@ -176,9 +176,9 @@ public interface KeyguardViewController { 
    //  achieving complete abstraction away from where the Keyguard View is mounted.



    /**

     * Registers the StatusBar to which this Keyguard View is mounted.

     * Registers the CentralSurfaces to which this Keyguard View is mounted.

     */

    void registerStatusBar(StatusBar statusBar,

    void registerCentralSurfaces(CentralSurfaces centralSurfaces,

            NotificationPanelViewController notificationPanelViewController,

            @Nullable PanelExpansionStateManager panelExpansionStateManager,

            BiometricUnlockController biometricUnlockController,

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

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;

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

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

import com.android.systemui.util.ViewController;
@@ -78,7 +78,7 @@ import javax.inject.Inject; 
 * For devices with UDFPS, the lock icon will show at the sensor location. Else, the lock

 * icon will show a set distance from the bottom of the device.

 */

@StatusBarComponent.StatusBarScope

@CentralSurfacesComponent.CentralSurfacesScope

public class LockIconViewController extends ViewController<LockIconView> implements Dumpable {

    private static final String TAG = "LockIconViewController";

    private static final float sDefaultDensity =

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.lang.annotation.Retention; 
import javax.inject.Scope;



/**

 * Scope annotation for singleton items within the StatusBarComponent.

 * Scope annotation for singleton items within the CentralSurfacesComponent.

 */

@Documented

@Retention(RUNTIME)