Merge "GlobalActions: Add isReboot as a param for ShutdownUi." into udc-d1-dev am: e256ce0716
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23520211 Change-Id: Iece58cecdee92c77480a2c77d9779132a7451f22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user