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

Commit 45f904a5 authored by Selim Cinek's avatar Selim Cinek
Browse files

resolved conflicts for merge of b38fd3d4 to master 

Change-Id: Iaa87cdad76e1fa08d93185fd537f3d2783346c8e
parents 7207b792 295609a9

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

+5 −0
Original line number Diff line number Diff line
@@ -335,6 +335,11 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL 
        }

    };



    @Override

    public boolean shouldDelayChildPressedState() {

        return true;

    }



    public void setShowEmergencyCallsOnly(boolean show) {

        mShowEmergencyCallsOnly = show;

        if (mExpanded) {

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+5 −0
Original line number Diff line number Diff line
@@ -1835,6 +1835,11 @@ public class NotificationStackScrollLayout extends ViewGroup 
        return super.dispatchTouchEvent(ev);

    }



    @Override

    public boolean shouldDelayChildPressedState() {

        return true;

    }



    /**

     * A listener that is notified when some child locations might have changed.

     */