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

Commit 2143c78f authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix privacy indicators in QQS with new headers" into tm-qpr-dev am:... 

Merge "Fix privacy indicators in QQS with new headers" into tm-qpr-dev am: 6b311488 am: 4d2d81f9

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



Change-Id: I9d5adb4706d2870074976d330b5460888f214da1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ec775ca 4d2d81f9

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

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Rect; 
import android.util.AttributeSet;

import android.util.Pair;

import android.view.DisplayCutout;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowInsets;
@@ -231,6 +232,16 @@ public class QuickStatusBarHeader extends FrameLayout { 
        }

    }



    @Override

    public boolean onTouchEvent(MotionEvent event) {

        // If using combined headers, only react to touches inside QuickQSPanel

        if (!mUseCombinedQSHeader || event.getY() > mHeaderQsPanel.getTop()) {

            return super.onTouchEvent(event);

        } else {

            return false;

        }

    }



    void updateResources() {

        Resources resources = mContext.getResources();

        boolean largeScreenHeaderActive =

packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt

+3 −0
Original line number Diff line number Diff line
@@ -280,6 +280,9 @@ class LargeScreenShadeHeaderController @Inject constructor( 
                    context.getString(com.android.internal.R.string.status_bar_alarm_clock)

            )

        }

        if (combinedHeaders) {

            privacyIconsController.onParentVisible()

        }

    }



    override fun onViewAttached() {

packages/SystemUI/tests/src/com/android/systemui/shade/LargeScreenShadeHeaderControllerCombinedTest.kt

+14 −0
Original line number Diff line number Diff line
@@ -645,6 +645,20 @@ class LargeScreenShadeHeaderControllerCombinedTest : SysuiTestCase() { 
        verify(animator).start()

    }



    @Test

    fun privacyChipParentVisibleFromStart() {

        verify(privacyIconsController).onParentVisible()

    }



    @Test

    fun privacyChipParentVisibleAlways() {

        controller.largeScreenActive = true

        controller.largeScreenActive = false

        controller.largeScreenActive = true



        verify(privacyIconsController, never()).onParentInvisible()

    }



    private fun createWindowInsets(

        topCutout: Rect? = Rect()

    ): WindowInsets {