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

Commit f5770af1 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents 5c805b3f fa0acf56

core/res/res/values-sw600dp/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -51,5 +51,9 @@ 
             4 - Snap to the long edges in each orientation and magnet to corners

    -->

    <integer name="config_pictureInPictureSnapMode">3</integer>



    <!-- Controls whether the nav bar can move from the bottom to the side in landscape.

         Only applies if the device display is not square. -->

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

</resources>

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -3112,6 +3112,10 @@ 
         -->

    <integer name="config_navBarOpacityMode">0</integer>



    <!-- Controls whether the nav bar can move from the bottom to the side in landscape.

         Only applies if the device display is not square. -->

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



    <!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows.

         These values are in DPs and will be converted to pixel sizes internally. -->

    <string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets">16x16</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2689,6 +2689,7 @@ 
  <java-symbol type="string" name="config_packagedKeyboardName" />

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

  <java-symbol type="integer" name="config_navBarOpacityMode" />

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

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



  <!-- EditText suggestion popup. -->

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

+1 −1
Original line number Diff line number Diff line
@@ -2727,7 +2727,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        int longSizeDp = longSize * DisplayMetrics.DENSITY_DEFAULT / density;



        // Allow the navigation bar to move on non-square small devices (phones).

        mNavigationBarCanMove = width != height && shortSizeDp < 600;

        mNavigationBarCanMove = width != height && res.getBoolean(R.bool.config_navBarCanMove);



        mHasNavigationBar = res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);