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

Commit 90bbe397 authored by Yorke Lee's avatar Yorke Lee Committed by android-build-merger
Browse files

Merge "Add config value to force nav bar to be opaque" into nyc-dev am: acc86abf 

am: db0a3dcb

* commit 'db0a3dcb':
  Add config value to force nav bar to be opaque
parents 52be4cd5 db0a3dcb

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2440,6 +2440,10 @@ 
         flag). -->

    <bool name="config_forceWindowDrawsStatusBarBackground">true</bool>



    <!-- If set, this will force the navigation bar to always be drawn with an opaque

         background. -->

    <bool name="config_forceNavBarAlwaysOpaque">false</bool>



    <!-- Default bounds [left top right bottom] on screen for picture-in-picture windows. -->

    <string translatable="false" name="config_defaultPictureInPictureBounds">"0 0 100 100"</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2391,6 +2391,7 @@ 


  <java-symbol type="string" name="config_packagedKeyboardName" />

  <java-symbol type="bool" name="config_forceWindowDrawsStatusBarBackground" />

  <java-symbol type="bool" name="config_forceNavBarAlwaysOpaque" />

  <java-symbol type="color" name="system_bar_background_semi_transparent" />



  <!-- EditText suggestion popup. -->

services/core/java/com/android/server/policy/PhoneWindowManager.java

+8 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    boolean mForceStatusBar;

    boolean mForceStatusBarFromKeyguard;

    private boolean mForceStatusBarTransparent;

    boolean mForceNavBarOpaque;

    boolean mHideLockScreen;

    boolean mForcingShowNavBar;

    int mForcingShowNavBarLayer;
@@ -1715,6 +1716,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        if (mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE)) {

            mShortPressWindowBehavior = SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE;

        }



        mForceNavBarOpaque = res.getBoolean(

                com.android.internal.R.bool.config_forceNavBarAlwaysOpaque);

    }



    @Override
@@ -7080,6 +7084,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    | View.SYSTEM_UI_TRANSPARENT);

        }



        if (mForceNavBarOpaque) {

            vis &= ~(View.NAVIGATION_BAR_TRANSLUCENT | View.NAVIGATION_BAR_TRANSPARENT);

        }



        if (mForceWindowDrawsStatusBarBackground) {

            vis |= View.STATUS_BAR_TRANSPARENT;

            vis &= ~View.STATUS_BAR_TRANSLUCENT;