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

Commit 20e71a79 authored by burakov's avatar burakov Committed by Danny Burakov
Browse files

[Dual Shade] Mark `ShadeMode.Split` as deprecated. 

Once Dual Shade is enabled by default in SceneContainer, we'll remove
`Split` from the `ShadeModeInteractor`, effectively removing split shade
from scene container.

Bug: 376411622
Bug: 411365508
Test: N/A, only added annotation and a comment.
Flag: com.android.systemui.scene_container
Change-Id: I77178a96c365e5511ff779e06c2da50c76bd4bd2
parent bb43d4a5

packages/SystemUI/res/values-sw600dp-land/config.xml

+6 −5
Original line number Diff line number Diff line
@@ -25,8 +25,14 @@ 
    <integer name="quick_qs_panel_max_tiles">6</integer>



    <!-- Whether to use the split 2-column notification shade -->

    <!-- TODO(b/411449027): This config is deprecated. Remove with the launch of SceneContainer. -->

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



    <!-- Whether to force split shade. This value has effect only when flag

    lockscreen.enable_landscape is enabled. -->

    <!-- TODO(b/411449027): This config is deprecated. Remove with the launch of SceneContainer. -->

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



    <!-- The number of rows in the paginated grid QuickSettings -->

    <integer name="quick_settings_paginated_grid_num_rows">3</integer>
@@ -41,9 +47,4 @@ 


    <integer name="power_menu_lite_max_columns">3</integer>

    <integer name="power_menu_lite_max_rows">2</integer>



    <!-- Whether to force split shade.

    For now, this value has effect only when flag lockscreen.enable_landscape is enabled.

    TODO (b/293252410) - change this comment/resource when flag is enabled -->

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

</resources>

packages/SystemUI/res/values/config.xml

+4 −3
Original line number Diff line number Diff line
@@ -668,11 +668,12 @@ 
    <integer name="bouncer_secondary_message_lines">2</integer>



    <!-- Whether to use the split 2-column notification shade -->

    <!-- TODO(b/411449027): This config is deprecated. Remove with the launch of SceneContainer. -->

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



    <!-- Whether to force split shade.

    For now, this value has effect only when flag lockscreen.enable_landscape is enabled.

    TODO (b/293252410) - change this comment/resource when flag is enabled -->

    <!-- Whether to force split shade. This value has effect only when flag

    lockscreen.enable_landscape is enabled. -->

    <!-- TODO(b/411449027): This config is deprecated. Remove with the launch of SceneContainer. -->

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



    <!-- Whether we use large screen shade header which takes only one row compared to QS header -->

packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeModeInteractor.kt

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ constructor( 
    ): ShadeMode {

        return when {

            isDualShadeEnabled -> ShadeMode.Dual

            // TODO(b/376411622): Once Dual Shade is enabled by default in SceneContainer, replace

            //  Split below with Dual. This will effectively remove Split mode from SceneContainer.

            isShadeLayoutWide -> ShadeMode.Split

            else -> ShadeMode.Single

        }

packages/SystemUI/src/com/android/systemui/shade/shared/model/ShadeMode.kt

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ sealed class ShadeMode : Diffable<ShadeMode> { 
     *

     * Note: This isn't the only mode where the shade is wide.

     */

    @Deprecated(

        """Deprecated in scene container. Only `Single` and `Dual` are possible when scene container

        is enabled."""

    )

    data object Split : ShadeMode()



    /**