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

Commit de0c539d authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Move shutdown UI to sysui (when possible)" into oc-dr1-dev

parents bb6653c4 b4302182

core/java/com/android/internal/statusbar/IStatusBar.aidl

+2 −0
Original line number Diff line number Diff line
@@ -115,4 +115,6 @@ oneway interface IStatusBar 
    void remQsTile(in ComponentName tile);

    void clickQsTile(in ComponentName tile);

    void handleSystemKey(in int key);



    void showShutdownUi(boolean isReboot, String reason);

}

core/res/res/values-television/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -39,4 +39,7 @@ 


    <!-- Whether the device uses the default focus highlight when focus state isn't specified. -->

    <bool name="config_useDefaultFocusHighlight">false</bool>



    <!-- Allow SystemUI to show the shutdown dialog -->

    <bool name="config_showSysuiShutdown">false</bool>

</resources>

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -3000,4 +3000,7 @@ 


    <!-- Enable the RingtonePickerActivity in 'com.android.providers.media'. -->

    <bool name="config_defaultRingtonePickerEnabled">true</bool>



    <!-- Allow SystemUI to show the shutdown dialog -->

    <bool name="config_showSysuiShutdown">true</bool>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3067,4 +3067,5 @@ 
  <java-symbol type="bool" name="config_showAreaUpdateInfoSettings" />

  <java-symbol type="layout" name="shutdown_dialog" />

  <java-symbol type="dimen" name="chooser_service_spacing" />

  <java-symbol type="bool" name="config_showSysuiShutdown" />

</resources>

packages/SystemUI/plugin/src/com/android/systemui/plugins/GlobalActions.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ public interface GlobalActions extends Plugin { 
    int VERSION = 1;



    void showGlobalActions(GlobalActionsManager manager);

    default void showShutdownUi(boolean isReboot, String reason) {

    }



    @ProvidesInterface(version = GlobalActionsManager.VERSION)

    public interface GlobalActionsManager {