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

Commit 990a14dd authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect QS paddings after relayout" into sc-v2-dev am: 26409be7 

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

Change-Id: I93f99b99a9db6a5922f0cc666f0b327689e1ea27
parents 9f667fb0 26409be7

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+52 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.res.Resources; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.util.ArrayMap;

import android.util.AttributeSet;

import android.util.Log;

import android.view.Gravity;
@@ -103,6 +104,8 @@ public class QSPanel extends LinearLayout implements Tunable { 
    protected LinearLayout mHorizontalContentContainer;



    protected QSTileLayout mTileLayout;

    private float mSquishinessFraction = 1f;

    private final ArrayMap<View, Integer> mChildrenLayoutTop = new ArrayMap<>();



    public QSPanel(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -179,10 +182,26 @@ public class QSPanel extends LinearLayout implements Tunable { 
        if (mTileLayout == null) {

            mTileLayout = (QSTileLayout) LayoutInflater.from(mContext)

                    .inflate(R.layout.qs_paged_tile_layout, this, false);

            mTileLayout.setSquishinessFraction(mSquishinessFraction);

        }

        return mTileLayout;

    }



    public void setSquishinessFraction(float squishinessFraction) {

        if (Float.compare(squishinessFraction, mSquishinessFraction) == 0) {

            return;

        }

        mSquishinessFraction = squishinessFraction;

        if (mTileLayout == null) {

            return;

        }

        mTileLayout.setSquishinessFraction(squishinessFraction);

        if (getMeasuredWidth() == 0) {

            return;

        }

        updateViewPositions();

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        if (mTileLayout instanceof PagedTileLayout) {
@@ -228,6 +247,39 @@ public class QSPanel extends LinearLayout implements Tunable { 
        setMeasuredDimension(getMeasuredWidth(), height);

    }



    @Override

    protected void onLayout(boolean changed, int l, int t, int r, int b) {

        super.onLayout(changed, l, t, r, b);

        for (int i = 0; i < getChildCount(); i++) {

            View child = getChildAt(i);

            mChildrenLayoutTop.put(child, child.getTop());

        }

        updateViewPositions();

    }



    private void updateViewPositions() {

        if (!(mTileLayout instanceof TileLayout)) {

            return;

        }

        TileLayout layout = (TileLayout) mTileLayout;



        // Adjust view positions based on tile squishing

        int tileHeightOffset = layout.getTilesHeight() - layout.getHeight();



        boolean move = false;

        for (int i = 0; i < getChildCount(); i++) {

            View child = getChildAt(i);

            if (move) {

                int top = mChildrenLayoutTop.get(child);

                child.setLeftTopRightBottom(child.getLeft(), top + tileHeightOffset,

                        child.getRight(), top + tileHeightOffset + child.getHeight());

            }

            if (child == mTileLayout) {

                move = true;

            }

        }

    }



    protected String getDumpableTag() {

        return TAG;

    }

packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 
        return mMediaHost;

    }



    public void setSquishinessFraction(float squishinessFraction) {

        mView.setSquishinessFraction(squishinessFraction);

    }



    @Override

    protected void onViewAttached() {

        mQsTileRevealController = createTileRevealController();

packages/SystemUI/src/com/android/systemui/qs/QSSquishinessController.kt

+2 −22
Original line number Diff line number Diff line 
package com.android.systemui.qs



import android.view.ViewGroup

import com.android.systemui.qs.dagger.QSFragmentModule.QQS_FOOTER

import com.android.systemui.qs.dagger.QSScope

import javax.inject.Inject

import javax.inject.Named



@QSScope

class QSSquishinessController @Inject constructor(

    @Named(QQS_FOOTER) private val qqsFooterActionsView: FooterActionsView,

    private val qsAnimator: QSAnimator,

    private val qsPanelController: QSPanelController,

    private val quickQSPanelController: QuickQSPanelController
@@ -33,23 +29,7 @@ class QSSquishinessController @Inject constructor( 
     * Change the height of all tiles and repositions their siblings.

     */

    private fun updateSquishiness() {

        (qsPanelController.tileLayout as QSPanel.QSTileLayout).setSquishinessFraction(squishiness)

        val tileLayout = quickQSPanelController.tileLayout as TileLayout

        tileLayout.setSquishinessFraction(squishiness)



        // Calculate how much we should move the footer

        val tileHeightOffset = tileLayout.height - tileLayout.tilesHeight

        val footerTopMargin = (qqsFooterActionsView.layoutParams as ViewGroup.MarginLayoutParams)

                .topMargin

        val nextTop = tileLayout.bottom - tileHeightOffset + footerTopMargin

        val amountMoved = nextTop - qqsFooterActionsView.top



        // Move the footer and other siblings (MediaPlayer)

        (qqsFooterActionsView.parent as ViewGroup?)?.let { parent ->

            val index = parent.indexOfChild(qqsFooterActionsView)

            for (i in index until parent.childCount) {

                parent.getChildAt(i).top += amountMoved

            }

        }

        qsPanelController.setSquishinessFraction(squishiness)

        quickQSPanelController.setSquishinessFraction(squishiness)

    }

}
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt

+4 −1
Original line number Diff line number Diff line
@@ -247,7 +247,10 @@ open class QSTileViewImpl @JvmOverloads constructor( 
        } else {

            measuredHeight

        }

        bottom = top + (actualHeight * squishinessFraction).toInt()

        // Limit how much we affect the height, so we don't have rounding artifacts when the tile

        // is too short.

        val constrainedSquishiness = 0.1f + squishinessFraction * 0.9f

        bottom = top + (actualHeight * constrainedSquishiness).toInt()

        scrollY = (actualHeight - height) / 2

    }

packages/SystemUI/tests/src/com/android/systemui/qs/QSSquishinessControllerTest.kt

+3 −12
Original line number Diff line number Diff line 
package com.android.systemui.qs



import android.testing.AndroidTestingRunner

import android.view.ViewGroup

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import org.junit.Before
@@ -9,7 +8,6 @@ import org.junit.Rule 
import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito.`when`

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.junit.MockitoJUnit
@@ -18,13 +16,9 @@ import org.mockito.junit.MockitoJUnit 
@SmallTest

class QSSquishinessControllerTest : SysuiTestCase() {



    @Mock private lateinit var qqsFooterActionsView: FooterActionsView

    @Mock private lateinit var qqsFooterActionsViewLP: ViewGroup.MarginLayoutParams

    @Mock private lateinit var qsAnimator: QSAnimator

    @Mock private lateinit var qsPanelController: QSPanelController

    @Mock private lateinit var quickQsPanelController: QuickQSPanelController

    @Mock private lateinit var tileLayout: TileLayout

    @Mock private lateinit var pagedTileLayout: PagedTileLayout



    @JvmField @Rule val mockitoRule = MockitoJUnit.rule()
@@ -32,11 +26,8 @@ class QSSquishinessControllerTest : SysuiTestCase() { 


    @Before

    fun setup() {

        qsSquishinessController = QSSquishinessController(qqsFooterActionsView, qsAnimator,

        qsSquishinessController = QSSquishinessController(qsAnimator,

                qsPanelController, quickQsPanelController)

        `when`(quickQsPanelController.tileLayout).thenReturn(tileLayout)

        `when`(qsPanelController.tileLayout).thenReturn(pagedTileLayout)

        `when`(qqsFooterActionsView.layoutParams).thenReturn(qqsFooterActionsViewLP)

    }



    @Test
@@ -51,7 +42,7 @@ class QSSquishinessControllerTest : SysuiTestCase() { 
    @Test

    fun setSquishiness_updatesTiles() {

        qsSquishinessController.squishiness = 0.5f

        verify(tileLayout).setSquishinessFraction(0.5f)

        verify(pagedTileLayout).setSquishinessFraction(0.5f)

        verify(qsPanelController).setSquishinessFraction(0.5f)

        verify(quickQsPanelController).setSquishinessFraction(0.5f)

    }

}
 
 No newline at end of file