From 79f6f8645c6bcdebd306942a306535ef74ceb213 Mon Sep 17 00:00:00 2001 From: Alison Cichowlas Date: Wed, 24 May 2023 09:09:55 -0400 Subject: [PATCH] GlobalActions: Add isReboot as a param for ShutdownUi. Test: atest ShutdownUiTest; atest ShutdownUiGoogleTest Bug: 283219108 Change-Id: I8e555e417f62f58fd6d6efd52f43f7493524fc89 --- .../com/android/systemui/globalactions/ShutdownUi.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/ShutdownUi.java b/packages/SystemUI/src/com/android/systemui/globalactions/ShutdownUi.java index 8125d70a6ab30..68dc1b3dc7d74 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/ShutdownUi.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/ShutdownUi.java @@ -98,7 +98,7 @@ public class ShutdownUi { window.setBackgroundDrawable(background); window.setWindowAnimations(com.android.systemui.R.style.Animation_ShutdownUi); - d.setContentView(getShutdownDialogContent()); + d.setContentView(getShutdownDialogContent(isReboot)); d.setCancelable(false); int color; @@ -129,7 +129,12 @@ public class ShutdownUi { d.show(); } - public int getShutdownDialogContent() { + /** + * Returns the layout resource to use for UI while shutting down. + * @param isReboot Whether this is a reboot or a shutdown. + * @return + */ + public int getShutdownDialogContent(boolean isReboot) { return R.layout.shutdown_dialog; }