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

Commit f5e5150b authored by Nick Chameyev's avatar Nick Chameyev
Browse files

Move floating rotation button handling to Launcher 

Moves handling of floating rotation button when navigation
bar is not created to the launcher. This button was not
showing when taskbar is visible as it was initialized in
navigation bar (which is not created for large screens).

Bug: 200103245
Test: rotate phone when autorotate disabled on inner screen
Test: showing rotate suggestion when gesture nav enabled/disabled
Change-Id: I0619acd9d24eb4ba36bdb601517f9a8370ee999a
parent c23d0de0

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

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ 
    <dimen name="fab_margin">24dp</dimen>



    <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

+0 −7
Original line number Diff line number Diff line
@@ -21,11 +21,4 @@ 
    <dimen name="navigation_side_padding">@dimen/button_size</dimen>

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

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



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



</resources>

packages/SystemUI/res/values/dimens.xml

+0 −11
Original line number Diff line number Diff line
@@ -56,11 +56,6 @@ 
    <!-- The amount by which the arrow is shifted to avoid the finger-->

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



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



    <!-- Height of notification icons in the status bar -->

    <dimen name="status_bar_icon_size">@*android:dimen/status_bar_icon_size</dimen>
@@ -358,8 +353,6 @@ 
    <!-- The width/height of the icon of a navigation button -->

    <dimen name="navigation_icon_size">32dp</dimen>



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



    <!-- The width of the view containing the menu/ime navigation bar icons -->

    <dimen name="navigation_extra_key_width">36dp</dimen>
@@ -971,9 +964,6 @@ 


    <dimen name="signal_indicator_to_icon_frame_spacing">3dp</dimen>



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

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



    <!-- Inset shadow for FakeShadowDrawable. It is used to avoid gaps between the card

         and the shadow. -->

    <dimen name="fake_shadow_inset">1dp</dimen>
@@ -1163,7 +1153,6 @@ 


    <!-- The absolute side margins of quick settings -->

    <dimen name="quick_settings_bottom_margin_media">8dp</dimen>

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

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

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

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

packages/SystemUI/shared/Android.bp

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

        ":wm_shell_util-sources",

    ],



    resource_dirs: [

        "res",

    ],

    static_libs: [

        "PluginCoreLib",

        "androidx.dynamicanimation_dynamicanimation",

packages/SystemUI/res/layout/rotate_suggestion.xml→packages/SystemUI/shared/res/layout/rotate_suggestion.xml

+2 −4
Original line number Diff line number Diff line
@@ -18,12 +18,10 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    >



    <com.android.systemui.navigationbar.buttons.KeyButtonView

    <com.android.systemui.shared.rotation.FloatingRotationButtonView

        android:id="@+id/rotate_suggestion"

        android:layout_width="@dimen/floating_rotation_button_diameter"

        android:layout_height="@dimen/floating_rotation_button_diameter"

        android:contentDescription="@string/accessibility_rotate_button"

        android:paddingStart="@dimen/navigation_key_padding"

        android:paddingEnd="@dimen/navigation_key_padding"

        android:layout_gravity="bottom|left"