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

Commit 94416e0f authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Collapse QS panel after details if we expanded it before" into nyc-dev am: 6dde42f0 

am: 410a288b

* commit '410a288b':
  Collapse QS panel after details if we expanded it before

Change-Id: I6516a64e6df111ab7fdcf0b94af433a634a46a5f
parents be4b6133 410a288b

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

+11 −2
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { 


    private QSCustomizer mCustomizePanel;

    private Record mDetailRecord;

    private boolean mTriggeredExpand;



    public QSPanel(Context context) {

        this(context, null);
@@ -384,8 +385,16 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { 
    }



    protected void handleShowDetail(Record r, boolean show) {

        if (show && !mExpanded) {

            mHost.animateExpandQS();

        if (show) {

            if (!mExpanded) {

                mTriggeredExpand = true;

                mHost.animateToggleQSExpansion();

            } else {

                mTriggeredExpand = false;

            }

        } else if (mTriggeredExpand) {

            mHost.animateToggleQSExpansion();

            mTriggeredExpand = false;

        }

        if (r instanceof TileRecord) {

            handleShowDetailTile((TileRecord) r, show);

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

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ public abstract class QSTile<TState extends State> implements Listenable { 
        void startRunnableDismissingKeyguard(Runnable runnable);

        void warn(String message, Throwable t);

        void collapsePanels();

        void animateExpandQS();

        void animateToggleQSExpansion();

        void openPanels();

        Looper getLooper();

        Context getContext();

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

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class QSTileHost implements QSTile.Host, Tunable { 
        // already logged

    }



    public void animateExpandQS() {

    public void animateToggleQSExpansion() {

        // TODO: Better path to animated panel expansion.

        mHeader.performClick();

    }