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

Commit 06da9f8b authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge \"Make Recents button work in demo mode\" into nyc-mr1-dev 

am: 9f311f68

Change-Id: Ife4a233149a90678d2ac55d473ae32a05020666c
parents c1262d45 9f311f68

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java

+2 −1
Original line number Diff line number Diff line
@@ -318,7 +318,8 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
    public void onClick(View v) {

        if (v == mSettingsButton) {

            MetricsLogger.action(mContext,

                    MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH);

                    mExpanded ? MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH

                            : MetricsProto.MetricsEvent.ACTION_QS_COLLAPSED_SETTINGS_LAUNCH);

            if (mSettingsButton.isTunerClick()) {

                if (TunerService.isTunerEnabled(mContext)) {

                    TunerService.showResetRequest(mContext, new Runnable() {

proto/src/metrics_constants.proto

+3 −0
Original line number Diff line number Diff line
@@ -2185,6 +2185,9 @@ message MetricsEvent { 
        //   SUBTYPE: false is off, true is on

    ACTION_TOGGLE_STORAGE_MANAGER = 489;



    // Settings launched from collapsed quick settings.

    ACTION_QS_COLLAPSED_SETTINGS_LAUNCH = 490;



    // ---- End N-MR1 Constants, all N-MR1 constants go above this line ----

    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS