Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SysUIG override for ShutdownUI.

Browse Source 
Extract layout choice to separate method;
include generic ShutdownUi specifically in non-SysUIG
versons rather than in all SysUIs.

Bug: 267722480
Test: builds; no user visible changes in shutdown flow
Merged-In: Iab225a5b733a78c6e0f8f5395f1516fe765994e2
Change-Id: Iab225a5b733a78c6e0f8f5395f1516fe765994e2
This commit is contained in:
Alison Cichowlas
2023-05-08 20:53:00 -04:00
parent 0e338eeb1f
commit 3b8a61fc50
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/dagger/ReferenceSysUIComponent.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.dagger;
import com.android.systemui.globalactions.ShutdownUiModule;
import com.android.systemui.keyguard.CustomizationProvider;
import com.android.systemui.statusbar.NotificationInsetsModule;
import com.android.systemui.statusbar.QsFrameTranslateModule;
@@ -31,6 +32,7 @@ import dagger.Subcomponent;
DependencyProvider.class,
NotificationInsetsModule.class,
QsFrameTranslateModule.class,
ShutdownUiModule.class,
SystemUIBinder.class,
SystemUIModule.class,
SystemUICoreStartableModule.class,

4
packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java
View File

@@ -74,12 +74,12 @@ import com.android.systemui.statusbar.policy.SensorPrivacyController;
import com.android.systemui.statusbar.policy.SensorPrivacyControllerImpl;
import com.android.systemui.volume.dagger.VolumeModule;
import javax.inject.Named;
import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import javax.inject.Named;
/**
* A dagger module for injecting default implementations of components of System UI.
*

2
packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
View File

@@ -50,7 +50,6 @@ import com.android.systemui.dreams.dagger.DreamModule;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.flags.FlagsModule;
import com.android.systemui.globalactions.ShutdownUiModule;
import com.android.systemui.keyboard.KeyboardModule;
import com.android.systemui.keyguard.data.BouncerViewModule;
import com.android.systemui.log.dagger.LogModule;
@@ -188,7 +187,6 @@ import javax.inject.Named;
ScreenRecordModule.class,
SettingsUtilModule.class,
ShadeModule.class,
ShutdownUiModule.class,
SmartRepliesInflationModule.class,
SmartspaceModule.class,
StatusBarPipelineModule.class,

6
packages/SystemUI/src/com/android/systemui/globalactions/ShutdownUi.java
View File

@@ -98,7 +98,7 @@ public class ShutdownUi {
window.setBackgroundDrawable(background);
window.setWindowAnimations(com.android.systemui.R.style.Animation_ShutdownUi);
d.setContentView(R.layout.shutdown_dialog);
d.setContentView(getShutdownDialogContent());
d.setCancelable(false);
int color;
@@ -129,6 +129,10 @@ public class ShutdownUi {
d.show();
}
public int getShutdownDialogContent() {
return R.layout.shutdown_dialog;
}
@StringRes
@VisibleForTesting int getRebootMessage(boolean isReboot, @Nullable String reason) {
if (reason != null && reason.startsWith(PowerManager.REBOOT_RECOVERY_UPDATE)) {

8
packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponent.java
View File

@@ -20,15 +20,14 @@ import com.android.systemui.dagger.DefaultComponentBinder;
import com.android.systemui.dagger.DependencyProvider;
import com.android.systemui.dagger.SysUIComponent;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.SystemUIBinder;
import com.android.systemui.dagger.SystemUIModule;
import com.android.systemui.globalactions.ShutdownUiModule;
import com.android.systemui.keyguard.dagger.KeyguardModule;
import com.android.systemui.recents.RecentsModule;
import com.android.systemui.statusbar.dagger.CentralSurfacesDependenciesModule;
import com.android.systemui.statusbar.notification.dagger.NotificationsModule;
import com.android.systemui.statusbar.notification.row.NotificationRowModule;
import com.android.systemui.keyguard.dagger.KeyguardModule;
import com.android.systemui.recents.RecentsModule;
import dagger.Subcomponent;
/**
@@ -43,6 +42,7 @@ import dagger.Subcomponent;
NotificationRowModule.class,
NotificationsModule.class,
RecentsModule.class,
ShutdownUiModule.class,
SystemUIModule.class,
TvSystemUIBinder.class,
TVSystemUICoreStartableModule.class,

4
packages/SystemUI/src/com/android/systemui/tv/TvSystemUIModule.java
View File

@@ -75,13 +75,13 @@ import com.android.systemui.statusbar.policy.SensorPrivacyControllerImpl;
import com.android.systemui.statusbar.tv.notifications.TvNotificationHandler;
import com.android.systemui.volume.dagger.VolumeModule;
import javax.inject.Named;
import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoSet;
import javax.inject.Named;
/**
* A TV specific version of {@link ReferenceSystemUIModule}.
*

4
packages/SystemUI/tests/src/com/android/systemui/globalactions/ShutdownUiTest.java
View File

@@ -33,9 +33,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
/**
* Tests for {@link ListGridLayout}.
*/
@SmallTest
@RunWith(AndroidTestingRunner.class)
public class ShutdownUiTest extends SysuiTestCase {