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

Commit eeedbc44 authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

Allow QS detail panels to change text of "Done" button 

User detail panel settings button will now say "Close" instead
of "Done"

Bug: 169783558
Test: atest SystemUITests
Change-Id: Ibafe212dce8a8b8654e877418200e1dc2c5dec8b
parent 45df6837

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/DetailAdapter.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,15 @@ public interface DetailAdapter { 
        return Resources.ID_NULL;

        return Resources.ID_NULL;

    }

    }





    /**

     * @return resource id of the string to use for closing the detail panel. If

     * {@code Resources.ID_NULL}, then use the default string:

     * {@code com.android.systemui.R.string.quick_settings_done}

     */

    default int getDoneText() {

        return Resources.ID_NULL;

    }



    void setToggleState(boolean state);

    void setToggleState(boolean state);

    int getMetricsCategory();

    int getMetricsCategory();

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -893,6 +893,8 @@ 
    <string name="quick_settings_more_user_settings">User settings</string>

    <string name="quick_settings_more_user_settings">User settings</string>

    <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->

    <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_done">Done</string>

    <string name="quick_settings_done">Done</string>

    <!-- QuickSettings: Control panel: Label for button that dismisses user switcher control panel. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_close_user_panel">Close</string>

    <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->

    <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_connected">Connected</string>

    <string name="quick_settings_connected">Connected</string>

    <!-- QuickSettings: Control panel: Label for connected device, showing remote device battery level. [CHAR LIMIT=NONE] -->

    <!-- QuickSettings: Control panel: Label for connected device, showing remote device battery level. [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/qs/QSDetail.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -140,9 +140,10 @@ public class QSDetail extends LinearLayout { 
    }

    }





    private void updateDetailText() {

    private void updateDetailText() {

        mDetailDoneButton.setText(R.string.quick_settings_done);

        int resId = mDetailAdapter != null ? mDetailAdapter.getDoneText() : Resources.ID_NULL;

        final int resId =

        mDetailDoneButton.setText(

                mDetailAdapter != null ? mDetailAdapter.getSettingsText() : Resources.ID_NULL;

                (resId != Resources.ID_NULL) ? resId : R.string.quick_settings_done);

        resId = mDetailAdapter != null ? mDetailAdapter.getSettingsText() : Resources.ID_NULL;

        mDetailSettingsButton.setText(

        mDetailSettingsButton.setText(

                (resId != Resources.ID_NULL) ? resId : R.string.quick_settings_more_settings);

                (resId != Resources.ID_NULL) ? resId : R.string.quick_settings_more_settings);

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -320,6 +320,11 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie 
            return false;

            return false;

        }

        }





        @Override

        public int getDoneText() {

            return R.string.quick_settings_close_user_panel;

        }



        @Override

        @Override

        public boolean onDoneButtonClicked() {

        public boolean onDoneButtonClicked() {

            if (mNotificationPanelViewController != null) {

            if (mNotificationPanelViewController != null) {