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

Commit 1cf05649 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not use shared lib resources" into sc-v2-dev am: cd12f1b2 am: 62c0e202 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16163399

Change-Id: Ic7f795e5307c603408d0489976fefab3b3792de6
parents d6a3afcf 62c0e202

packages/SystemUI/res/values-sw600dp/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 


    <dimen name="navigation_key_width">128dp</dimen>



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



    <!-- Keyboard shortcuts helper -->

    <dimen name="ksh_layout_width">488dp</dimen>

packages/SystemUI/res/values-sw900dp/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 
-->

<resources>



    <!-- The maximum width of the navigation bar ripples. -->

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



    <!-- The padding around the navigation buttons -->

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



    <dimen name="button_size">80dp</dimen>

    <dimen name="navigation_side_padding">@dimen/button_size</dimen>

    <dimen name="navigation_key_width">@dimen/button_size</dimen>

packages/SystemUI/res/values/dimens.xml

+13 −0
Original line number Diff line number Diff line
@@ -420,6 +420,19 @@ 
    <!-- Size of the icon inside each item in the ringer selector drawer. -->

    <dimen name="volume_ringer_drawer_icon_size">24dp</dimen>



    <!-- 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="navigation_key_padding">0dp</dimen>



    <!-- Floating rotation button -->

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

    <dimen name="floating_rotation_button_min_margin">20dp</dimen>

    <dimen name="floating_rotation_button_taskbar_left_margin">20dp</dimen>

    <dimen name="floating_rotation_button_taskbar_bottom_margin">10dp</dimen>



    <!-- Gravity for the notification panel -->

    <integer name="notification_panel_layout_gravity">0x31</integer><!-- center_horizontal|top -->

packages/SystemUI/shared/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ android_library { 
        ":wm_shell-aidls",

        ":wm_shell_util-sources",

    ],

    resource_dirs: [

        "res",

    ],

    static_libs: [

        "PluginCoreLib",

        "androidx.dynamicanimation_dynamicanimation",