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

Commit cffea95e authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 3fb4ee4e: Merge "Immediately close the shade when the status bar is... 

am 3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair

Merge commit '3fb4ee4e' into eclair-plus-aosp

* commit '3fb4ee4e':
  Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
parents d31d7397 3fb4ee4e

services/java/com/android/server/status/StatusBarService.java

+4 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,10 @@ public class StatusBarService extends IStatusBar.Stub 
        // act accordingly

        if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {

            if ((net & StatusBarManager.DISABLE_EXPAND) != 0) {

                animateCollapse();

                Log.d(TAG, "DISABLE_EXPAND: yes");

                mAnimating = false;

                updateExpandedViewPos(0);

                performCollapse();

            }

        }

        if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {