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

Commit 894695df authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Introduce input_method_navigation_bar_height 

With the removal of the Taskbar InsetsSizeOverride for the IME in [1],
there would be a small discrepancy in large screen devices between
navigation modes. Three button navigation mode would use the taskbar
height (56dp), while gesture navigation mode would use the IME
Navigation bar height (48dp), which doesn't reflect the accurate size
between form factors.

This introduces a new dimension value for the IME navigation bar height,
matching the height of the system navigation bar in three button
navigation mode on non-large screen devices, and the height of the
taskbar in three button navigation mode on large screen devices.

  [1]: I5d40b7f99a197ca35d2db196711b0087aa146c74

Flag: EXEMPT bugfix
Bug: 407507279
Bug: 397328336
Test: manually verifying IME insets between navigation modes on
  non-large screen and large screen devices
Change-Id: I9a0cd7285d4d096ff5d9071d08ca5762947766f0
parent 21eb5165

core/java/android/inputmethodservice/NavigationBarController.java

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ final class NavigationBarController implements Window.DecorCallback, 
    private int getImeCaptionBarHeight(boolean imeDrawsImeNavBar) {

        return imeDrawsImeNavBar

                ? mService.getResources().getDimensionPixelSize(

                        com.android.internal.R.dimen.navigation_bar_frame_height)

                        com.android.internal.R.dimen.input_method_navigation_bar_height)

                : 0;

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ 
    <dimen name="input_method_navigation_key_width">128dp</dimen>

    <!-- Copied from SysUI's @dimen/navigation_key_padding for the embedded nav bar in the IME -->

    <dimen name="input_method_navigation_key_padding">25dp</dimen>

    <!-- Height of the IME navigation bar; this matches the height of the taskbar in three button

         navigation mode. -->

    <dimen name="input_method_navigation_bar_height">@dimen/taskbar_frame_height</dimen>



    <!-- Height of FaceUnlock view in keyguard -->

    <dimen name="face_unlock_height">430dip</dimen>

core/res/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ 
    <!-- Copied from SysUI's @dimen/key_button_ripple_max_width for the embedded nav bar in the

         IME. -->

    <dimen name="input_method_nav_key_button_ripple_max_width">95dp</dimen>

    <!-- Height of the IME navigation bar; this matches the height of the system navigation bar

         in three button navigation mode. -->

    <dimen name="input_method_navigation_bar_height">@dimen/navigation_bar_frame_height</dimen>



    <!-- Width of the window of the divider bar used to resize docked stacks. -->

    <dimen name="docked_stack_divider_thickness">48dp</dimen>

core/res/res/values/symbols.xml

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


  <!-- Gestural Nav buttons within InputMethodService -->

  <java-symbol type="dimen" name="input_method_nav_key_button_ripple_max_width" />

  <java-symbol type="dimen" name="input_method_navigation_bar_height" />

  <java-symbol type="drawable" name="ic_ime_nav_back" />

  <java-symbol type="drawable" name="ic_ime_switcher" />

  <java-symbol type="drawable" name="ic_ime_switcher_new" />