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

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

am 504135b5: Merge "Fix status bar disabling." into jb-mr1-dev 

* commit '504135b5':
  Fix status bar disabling.
parents d6be8eae 504135b5

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

+7 −0
Original line number Diff line number Diff line
@@ -69,8 +69,15 @@ public class PanelBar extends FrameLayout { 
        return mPanels.get((int)(N * x / getMeasuredWidth()));

    }



    public boolean isEnabled() {

        return true;

    }



    @Override

    public boolean onTouchEvent(MotionEvent event) {

        // Allow subclasses to implement enable/disable semantics

        if (!isEnabled()) return false;



        // figure out which panel needs to be talked to here

        if (event.getAction() == MotionEvent.ACTION_DOWN) {

            mTouchingPanel = selectPanelForTouchX(event.getX());

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

+0 −4
Original line number Diff line number Diff line
@@ -1309,10 +1309,6 @@ public class PhoneStatusBar extends BaseStatusBar { 


        mGestureRec.add(event);



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

            return false;

        }



        return false;

    }

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

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.phone;



import android.app.ActivityManager;

import android.app.StatusBarManager;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Resources;
@@ -69,6 +70,11 @@ public class PhoneStatusBarView extends PanelBar { 
        }

    }



    @Override

    public boolean isEnabled() {

        return ((mBar.mDisabled & StatusBarManager.DISABLE_EXPAND) == 0);

    }



    @Override

    public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {

        if (super.onRequestSendAccessibilityEvent(child, event)) {