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

Commit c9b478f5 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Make Edit mode edge-to-edge" into main

parents d14beb99 4a62fbb0

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationsQuickSettingsContainerTest.kt

+14 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.shade



import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.view.View

import android.view.ViewGroup

import android.widget.FrameLayout
@@ -24,6 +26,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.qs.QSFragmentLegacy

import com.android.systemui.qs.flags.QSComposeFragment

import com.android.systemui.res.R

import com.android.systemui.util.mockito.whenever

import com.google.common.truth.Truth.assertThat
@@ -59,7 +62,8 @@ class NotificationsQuickSettingsContainerTest : SysuiTestCase() { 
    }



    @Test

    fun qsContainerPaddingSetAgainAfterQsRecreated() {

    @DisableFlags(QSComposeFragment.FLAG_NAME)

    fun qsContainerPaddingSetAgainAfterQsRecreated_flagOn() {

        val padding = 100

        underTest.setQSContainerPaddingBottom(padding)
@@ -72,6 +76,15 @@ class NotificationsQuickSettingsContainerTest : SysuiTestCase() { 
        assertThat(qsContainer.paddingBottom).isEqualTo(padding)

    }



    @Test

    @EnableFlags(QSComposeFragment.FLAG_NAME)

    fun qsContainerPadding_notSetWhenFlagOff() {

        val padding = 100

        underTest.setQSContainerPaddingBottom(padding)



        assertThat(qsContainer.paddingBottom).isEqualTo(0)

    }



    private fun setUpViews() {

        qsView = FrameLayout(context)

        qsContainer = View(context)

packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt

+4 −1
Original line number Diff line number Diff line
@@ -44,11 +44,14 @@ import androidx.compose.foundation.layout.Box 
import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.WindowInsets

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.offset

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.requiredHeightIn

import androidx.compose.foundation.layout.systemBars

import androidx.compose.foundation.layout.windowInsetsBottomHeight

import androidx.compose.foundation.verticalScroll

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable
@@ -712,7 +715,6 @@ constructor( 
                        lifecycleScope.launch { scrollState.scrollTo(0) }

                        onDispose { lifecycleScope.launch { scrollState.scrollTo(0) } }

                    }



                    Column(

                        modifier =

                            Modifier.fillMaxSize()
@@ -838,6 +840,7 @@ constructor( 
                    }

                }

            }

            Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))

        }

    }

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.compose.foundation.layout.IntrinsicSize 
import androidx.compose.foundation.layout.PaddingValues

import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.WindowInsets

import androidx.compose.foundation.layout.fillMaxHeight

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.fillMaxWidth
@@ -54,6 +55,8 @@ import androidx.compose.foundation.layout.heightIn 
import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.requiredHeightIn

import androidx.compose.foundation.layout.size

import androidx.compose.foundation.layout.systemBars

import androidx.compose.foundation.layout.windowInsetsBottomHeight

import androidx.compose.foundation.layout.wrapContentHeight

import androidx.compose.foundation.lazy.grid.GridCells

import androidx.compose.foundation.lazy.grid.LazyGridScope
@@ -596,6 +599,7 @@ private fun AvailableTileGrid( 
                }

            }

        }

        Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))

    }

}

packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java

+10 −7
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import androidx.constraintlayout.widget.ConstraintSet; 


import com.android.systemui.fragments.FragmentHostManager.FragmentListener;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.qs.flags.QSComposeFragment;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.notification.AboveShelfObserver;
@@ -114,6 +115,7 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout 


    public void setQSContainerPaddingBottom(int paddingBottom) {

        mLastQSPaddingBottom = paddingBottom;

        if (!QSComposeFragment.isEnabled()) {

            if (mQSContainer != null) {

                mQSContainer.setPadding(

                        mQSContainer.getPaddingLeft(),
@@ -123,6 +125,7 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout 
                );

            }

        }

    }



    public void setInsetsChangedListener(Consumer<WindowInsets> onInsetsChangedListener) {

        mInsetsChangedListener = onInsetsChangedListener;