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

Commit a966dedc authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Prepare for flexible system bars" into rvc-dev am: beb2f1f9 

Change-Id: I765362fe04038289727d83df26e18495d3515687
parents ecbd7e3a beb2f1f9

packages/CarSystemUI/res/layout/car_left_navigation_bar.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
        android:gravity="top"

        android:paddingTop="30dp"

        android:layout_weight="1"

        android:background="@drawable/system_bar_background"

        android:animateLayoutChanges="true">



        <com.android.systemui.car.navigationbar.CarNavigationButton

packages/CarSystemUI/res/layout/car_left_navigation_bar_unprovisioned.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
        android:gravity="top"

        android:paddingTop="30dp"

        android:layout_weight="1"

        android:background="@drawable/system_bar_background"

        android:animateLayoutChanges="true">



        <com.android.systemui.car.navigationbar.CarNavigationButton

packages/CarSystemUI/res/layout/car_right_navigation_bar.xml

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
        android:gravity="top"

        android:paddingTop="30dp"

        android:layout_weight="1"

        android:background="@drawable/system_bar_background"

        android:animateLayoutChanges="true">



        <com.android.systemui.car.navigationbar.CarNavigationButton

packages/CarSystemUI/res/layout/car_right_navigation_bar_unprovisioned.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
        android:gravity="top"

        android:paddingTop="30dp"

        android:layout_weight="1"

        android:background="@drawable/system_bar_background"

        android:animateLayoutChanges="true">



        <com.android.systemui.car.navigationbar.CarNavigationButton

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBar.java

+16 −16
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.car.navigationbar; 
import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;

import static android.view.InsetsState.ITYPE_STATUS_BAR;

import static android.view.InsetsState.containsType;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;



import static com.android.systemui.statusbar.phone.BarTransitions.MODE_SEMI_TRANSPARENT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARENT;
@@ -28,7 +27,6 @@ import android.content.Context; 
import android.content.res.Resources;

import android.graphics.PixelFormat;

import android.inputmethodservice.InputMethodService;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;

import android.os.RemoteException;
@@ -354,33 +352,38 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
            WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                    ViewGroup.LayoutParams.MATCH_PARENT,

                    height,

                    WindowManager.LayoutParams.TYPE_STATUS_BAR,

                    WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL,

                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                            | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH

                            | WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,

                            | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                            | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH

                            | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,

                    PixelFormat.TRANSLUCENT);

            lp.token = new Binder();

            lp.gravity = Gravity.TOP;

            lp.setFitInsetsTypes(0 /* types */);

            lp.setTitle("TopCarNavigationBar");

            lp.packageName = mContext.getPackageName();

            lp.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

            lp.providesInsetsTypes = new int[]{ITYPE_STATUS_BAR};

            lp.setFitInsetsTypes(0);

            lp.windowAnimations = 0;

            lp.gravity = Gravity.TOP;

            mWindowManager.addView(mTopNavigationBarWindow, lp);

        }



        if (mBottomNavigationBarWindow != null && !mBottomNavBarVisible) {

            mBottomNavBarVisible = true;

            int height = mResources.getDimensionPixelSize(

                    com.android.internal.R.dimen.navigation_bar_height);



            WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,

                    WindowManager.LayoutParams.TYPE_NAVIGATION_BAR,

                    ViewGroup.LayoutParams.MATCH_PARENT,

                    height,

                    WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,

                    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("BottomCarNavigationBar");

            lp.providesInsetsTypes = new int[]{ITYPE_NAVIGATION_BAR};

            lp.windowAnimations = 0;

            lp.gravity = Gravity.BOTTOM;

            mWindowManager.addView(mBottomNavigationBarWindow, lp);

        }
@@ -397,11 +400,10 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
                    PixelFormat.TRANSLUCENT);

            leftlp.setTitle("LeftCarNavigationBar");

            leftlp.windowAnimations = 0;

            leftlp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_IS_SCREEN_DECOR;

            leftlp.gravity = Gravity.LEFT;

            leftlp.setFitInsetsTypes(0 /* types */);

            mWindowManager.addView(mLeftNavigationBarWindow, leftlp);

        }



        if (mRightNavigationBarWindow != null) {

            int width = mResources.getDimensionPixelSize(

                    R.dimen.car_right_navigation_bar_width);
@@ -415,9 +417,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
                    PixelFormat.TRANSLUCENT);

            rightlp.setTitle("RightCarNavigationBar");

            rightlp.windowAnimations = 0;

            rightlp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_IS_SCREEN_DECOR;

            rightlp.gravity = Gravity.RIGHT;

            rightlp.setFitInsetsTypes(0 /* types */);

            mWindowManager.addView(mRightNavigationBarWindow, rightlp);

        }

    }