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

Commit 817ad2bf authored by Fabian Kozynski's avatar Fabian Kozynski Committed by android-build-merger
Browse files

Merge "Prevents QS Header info clicks when it's hidden" into qt-dev am: 330279c7 

am: 1967ba97

Change-Id: Ic2018d3ceb4bc37aac243af4c3182bc7fe877494
parents 30e179b1 1967ba97

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

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public class QSCarrierGroup extends LinearLayout implements 


    @Override

    public void onClick(View v) {

        if (!v.isVisibleToUser()) return;

        mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                Settings.ACTION_WIRELESS_SETTINGS), 0);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
        if (v == mClockView) {

            mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                    AlarmClock.ACTION_SHOW_ALARMS), 0);

        } else if (v == mNextAlarmContainer) {

        } else if (v == mNextAlarmContainer && mNextAlarmContainer.isVisibleToUser()) {

            if (mNextAlarm.getShowIntent() != null) {

                mActivityStarter.postStartActivityDismissingKeyguard(

                        mNextAlarm.getShowIntent());
@@ -545,7 +545,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
                        new Intent(Intent.ACTION_REVIEW_ONGOING_PERMISSION_USAGE), 0);

                mHost.collapsePanels();

            });

        } else if (v == mRingerContainer) {

        } else if (v == mRingerContainer && mRingerContainer.isVisibleToUser()) {

            mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                    Settings.ACTION_SOUND_SETTINGS), 0);

        }