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

Commit b89cbc6f authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Introduce config_imeDrawsImeNavBar 

This is a follow up CL to my previous CL [1], which used the following
conditions to determine when to let the IME render the back and IME
switcher buttons.

 * InputMethodService#canImeRenderGesturalNavButtons(), and
 * com.android.internal.R.integer.config_navBarInteractionMode == 2

In production, there may be cases when we want to use the previous
mode even if config_navBarInteractionMode remains to be 2.  As a
preparation to support such scenarios, this CL introduces

  config_navBarInteractionMode

as an overlayable resource.  In subsequent CLs, we will start actually
using it.

Anyway there should be no observable behavior change in this CL.

 [1]: I3e7e1f83554444131e2765dc159617bb9e2337c7
      ff7b453c

Bug: 216118048
Test: Manually verified as follows
 1. Build aosp_coral-userdebug and flash it
 2. adb shell cmd overlay lookup android android:bool/config_imeDrawsImeNavBar
     => "false"
 3. Enable gestural navigation
 4. adb shell cmd overlay lookup android android:bool/config_imeDrawsImeNavBar
     => "true"
Change-Id: I0651a99b6007a84be63b85b579a85af0f24bb6ec
parent e4297308

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -3658,6 +3658,9 @@ 
    <!-- Controls whether the navigation bar lets through taps. -->

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



    <!-- Controls whether the IME renders the back and IME switcher buttons or not. -->

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



    <!-- Controls whether the side edge gestures can always trigger the transient nav bar to

         show. -->

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

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2991,6 +2991,7 @@ 
  <java-symbol type="integer" name="config_navBarInteractionMode" />

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

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

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

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

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

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

packages/overlays/NavigationBarModeGesturalOverlay/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
    <!-- Controls whether the navigation bar lets through taps. -->

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



    <!-- Controls whether the IME renders the back and IME switcher buttons or not. -->

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



    <!-- Controls the size of the back gesture inset. -->

    <dimen name="config_backGestureInset">30dp</dimen>

packages/overlays/NavigationBarModeGesturalOverlayExtraWideBack/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
    <!-- Controls whether the navigation bar lets through taps. -->

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



    <!-- Controls whether the IME renders the back and IME switcher buttons or not. -->

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



    <!-- Controls the size of the back gesture inset. -->

    <dimen name="config_backGestureInset">40dp</dimen>

packages/overlays/NavigationBarModeGesturalOverlayNarrowBack/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
    <!-- Controls whether the navigation bar lets through taps. -->

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



    <!-- Controls whether the IME renders the back and IME switcher buttons or not. -->

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



    <!-- Controls the size of the back gesture inset. -->

    <dimen name="config_backGestureInset">18dp</dimen>