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

Commit 8c24cc13 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Android (Google) Code Review
Browse files

Merge "sysui: refactor PhoneStatusBar"

parents 1f42e989 d839d1ac

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

+7 −3
Original line number Original line Diff line number Diff line
@@ -293,7 +293,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    Display mDisplay;

    Display mDisplay;

    Point mCurrentDisplaySize = new Point();

    Point mCurrentDisplaySize = new Point();





    StatusBarWindowView mStatusBarWindow;

    protected StatusBarWindowView mStatusBarWindow;

    PhoneStatusBarView mStatusBarView;

    PhoneStatusBarView mStatusBarView;

    private int mStatusBarWindowState = WINDOW_STATE_SHOWING;

    private int mStatusBarWindowState = WINDOW_STATE_SHOWING;

    protected StatusBarWindowManager mStatusBarWindowManager;

    protected StatusBarWindowManager mStatusBarWindowManager;
@@ -673,8 +673,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        updateDisplaySize(); // populates mDisplayMetrics

        updateDisplaySize(); // populates mDisplayMetrics

        updateResources();

        updateResources();





        mStatusBarWindow = (StatusBarWindowView) View.inflate(context,

        inflateStatusBarWindow(context);

                R.layout.super_status_bar, null);

        mStatusBarWindow.setService(this);

        mStatusBarWindow.setService(this);

        mStatusBarWindow.setOnTouchListener(new View.OnTouchListener() {

        mStatusBarWindow.setOnTouchListener(new View.OnTouchListener() {

            @Override

            @Override
@@ -935,6 +934,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        return mStatusBarView;

        return mStatusBarView;

    }

    }





    protected void inflateStatusBarWindow(Context context) {

        mStatusBarWindow = (StatusBarWindowView) View.inflate(context,

                R.layout.super_status_bar, null);

    }



    protected void createNavigationBarView(Context context) {

    protected void createNavigationBarView(Context context) {

        inflateNavigationBarView(context);

        inflateNavigationBarView(context);

        mNavigationBarView.setDisabledFlags(mDisabled1);

        mNavigationBarView.setDisabledFlags(mDisabled1);