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

Commit 24d6b891 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

"rounded_corner_content_padding" as a FW resource 

This is a follow up CL to my previous CL [1], which introduced

  input_method_nav_content_padding

as a copy of SysUI's

  nav_content_padding.

What we found since then is that instead of trying to keep two
resources in sync it'd be more easier if we have

  nav_content_padding

as an internal Framework resource.

With this CL, SysUI's one becomes a synonym of the FW's one.

Note that existing device-specific overlays for SysUI resources
continue to work hence there should be no observable behavior change
in this CL.

In subsequent CLs, we are going to update each device-specific
resource overlay to override FW's one.

 [1]: I3e7e1f83554444131e2765dc159617bb9e2337c7
      ff7b453c

Bug: 215554582
Test: Manually verified that the nav button locations are the same
Change-Id: I0c3717c0bdfc928167c6eba06247b37caabf33b9
parent b7f55ec5

core/res/res/layout/input_method_navigation_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_marginStart="@dimen/input_method_rounded_corner_content_padding"

    android:layout_marginEnd="@dimen/input_method_rounded_corner_content_padding"

    android:layout_marginStart="@dimen/rounded_corner_content_padding"

    android:layout_marginEnd="@dimen/rounded_corner_content_padding"

    android:paddingStart="@dimen/input_method_nav_content_padding"

    android:paddingEnd="@dimen/input_method_nav_content_padding"

    android:clipChildren="false"

core/res/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -131,15 +131,15 @@ 
        corners. -->

    <dimen name="rounded_corner_radius_bottom_adjustment">0px</dimen>



    <!-- Default paddings for content around the corners. -->

    <dimen name="rounded_corner_content_padding">0dp</dimen>



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

    <dimen name="input_method_navigation_key_width">70dp</dimen>

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

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

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

    <dimen name="input_method_nav_content_padding">0px</dimen>

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

         IME. -->

    <dimen name="input_method_rounded_corner_content_padding">0px</dimen>

    <!-- 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>

packages/SystemUI/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -432,7 +432,9 @@ 
    <!-- The maximum width of the navigation bar ripples. -->

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



    <dimen name="rounded_corner_content_padding">0dp</dimen>

    <dimen name="rounded_corner_content_padding">

        @*android:dimen/rounded_corner_content_padding

    </dimen>



    <dimen name="navigation_key_padding">0dp</dimen>