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

Commit b5cc48f8 authored by Yoshinori Hirano's avatar Yoshinori Hirano Committed by android-build-merger
Browse files

Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev am: dc23c5e8 

am: 0a5d0963

Change-Id: I595e06692d61a4f8961254d6a2bddc5cc17b082a
parents 555d6bc2 0a5d0963

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

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import java.util.Collection; 
public interface QSHost {

    void warn(String message, Throwable t);

    void collapsePanels();

    void forceCollapsePanels();

    void openPanels();

    Context getContext();

    Collection<QSTile> getTiles();

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

+5 −0
Original line number Diff line number Diff line
@@ -142,6 +142,11 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory> { 
        mStatusBar.postAnimateCollapsePanels();

    }



    @Override

    public void forceCollapsePanels() {

        mStatusBar.postAnimateForceCollapsePanels();

    }



    @Override

    public void openPanels() {

        mStatusBar.postAnimateOpenPanels();

packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class TileServices extends IQSService.Stub { 
        if (customTile != null) {

            verifyCaller(customTile);

            customTile.onDialogShown();

            mHost.collapsePanels();

            mHost.forceCollapsePanels();

            mServices.get(customTile).setShowingDialog(true);

        }

    }
@@ -224,7 +224,7 @@ public class TileServices extends IQSService.Stub { 
        CustomTile customTile = getTileForToken(token);

        if (customTile != null) {

            verifyCaller(customTile);

            mHost.collapsePanels();

            mHost.forceCollapsePanels();

        }

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -2898,6 +2898,15 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mHandler.post(mAnimateCollapsePanels);

    }



    public void postAnimateForceCollapsePanels() {

        mHandler.post(new Runnable() {

            @Override

            public void run() {

                animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);

            }

        });

    }



    public void postAnimateOpenPanels() {

        mHandler.sendEmptyMessage(MSG_OPEN_SETTINGS_PANEL);

    }