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

Commit 97fffca6 authored by Jian-Yang Liu's avatar Jian-Yang Liu Committed by android-build-merger
Browse files

Merge "Changed car status bar to show or hide by setting layout height instead... 

Merge "Changed car status bar to show or hide by setting layout height instead of removing/adding the view." into qt-qpr1-dev am: e6e23199
am: b1ceaefe

Change-Id: I1b39321452a8d74885220a5efa14e3f7e5c70e07
parents 823d8afa b1ceaefe

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+22 −40
Original line number Diff line number Diff line
@@ -979,15 +979,25 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
        }



        boolean isKeyboardVisible = (vis & InputMethodService.IME_VISIBLE) != 0;

        if (!isKeyboardVisible) {

            attachBottomNavBarWindow();

        } else {

            detachBottomNavBarWindow();

        }

        showBottomNavBarWindow(isKeyboardVisible);

    }



    private void attachNavBarWindows() {

        attachBottomNavBarWindow();

        if (mShowBottom && !mBottomNavBarVisible) {

            mBottomNavBarVisible = true;



            WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                    LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT,

                    WindowManager.LayoutParams.TYPE_NAVIGATION_BAR,

                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                            | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                            | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH

                            | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,

                    PixelFormat.TRANSLUCENT);

            lp.setTitle("CarNavigationBar");

            lp.windowAnimations = 0;

            mWindowManager.addView(mNavigationBarWindow, lp);

        }



        if (mShowLeft) {

            int width = mContext.getResources().getDimensionPixelSize(
@@ -1025,47 +1035,19 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
        }

    }



    /**

     * Attaches the bottom nav bar window. Can be extended to modify the specific behavior of

     * attaching the bottom nav bar.

     */

    protected void attachBottomNavBarWindow() {

    private void showBottomNavBarWindow(boolean isKeyboardVisible) {

        if (!mShowBottom) {

            return;

        }



        if (mBottomNavBarVisible) {

        // If keyboard is visible and bottom nav bar not visible, this is the correct state, so do

        // nothing. Same with if keyboard is not visible and bottom nav bar is visible.

        if (isKeyboardVisible ^ mBottomNavBarVisible) {

            return;

        }

        mBottomNavBarVisible = true;



        WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT,

                WindowManager.LayoutParams.TYPE_NAVIGATION_BAR,

                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                        | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                        | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH

                        | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,

                PixelFormat.TRANSLUCENT);

        lp.setTitle("CarNavigationBar");

        lp.windowAnimations = 0;

        mWindowManager.addView(mNavigationBarWindow, lp);

    }



    /**

     * Detaches the bottom nav bar window. Can be extended to modify the specific behavior of

     * detaching the bottom nav bar.

     */

    protected void detachBottomNavBarWindow() {

        if (!mShowBottom) {

            return;

        }



        if (!mBottomNavBarVisible) {

            return;

        }

        mBottomNavBarVisible = false;

        mWindowManager.removeView(mNavigationBarWindow);

        mNavigationBarWindow.setVisibility(isKeyboardVisible ? View.GONE : View.VISIBLE);

        mBottomNavBarVisible = !isKeyboardVisible;

    }



    private void buildTopBar(int layout) {