From 557fc354c138b5b22dca865531dc087086a1e52c Mon Sep 17 00:00:00 2001 From: Galia Peycheva Date: Thu, 5 May 2022 10:51:10 +0200 Subject: [PATCH] Set TvBottomSheetActivity as unrestricted keep-clear area This makes the Tv Pip move away from the dialog in order to not cover its content Bug: 227596282 Test: manual: start activity in Pip; start Duo and send: adb shell cmd sensor_privacy enable 0 microphone && \ adb shell appops start com.google.android.apps.tachyon 27 Change-Id: Ifb0a11cc6c09b2b088d8a28c6016b831f5c57ac9 --- data/etc/com.android.systemui.xml | 1 + packages/SystemUI/AndroidManifest.xml | 2 ++ .../com/android/systemui/tv/TvBottomSheetActivity.java | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml index ebf5832147f7f..f030d80a3533f 100644 --- a/data/etc/com.android.systemui.xml +++ b/data/etc/com.android.systemui.xml @@ -80,5 +80,6 @@ + diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 290ce345694e2..4d0888ab8d2de 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -323,6 +323,8 @@ + + diff --git a/packages/SystemUI/src/com/android/systemui/tv/TvBottomSheetActivity.java b/packages/SystemUI/src/com/android/systemui/tv/TvBottomSheetActivity.java index 2b7a33260248e..90f24347d20dc 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/TvBottomSheetActivity.java +++ b/packages/SystemUI/src/com/android/systemui/tv/TvBottomSheetActivity.java @@ -18,15 +18,18 @@ package com.android.systemui.tv; import android.app.Activity; import android.graphics.PixelFormat; +import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.util.DisplayMetrics; import android.util.Log; import android.view.Gravity; +import android.view.View; import android.view.WindowManager; import com.android.systemui.R; +import java.util.Collections; import java.util.function.Consumer; /** @@ -75,6 +78,12 @@ public abstract class TvBottomSheetActivity extends Activity { getWindow().setElevation(getWindow().getElevation() + 5); getWindow().setBackgroundBlurRadius(getResources().getDimensionPixelSize( R.dimen.bottom_sheet_background_blur_radius)); + + final View rootView = findViewById(R.id.bottom_sheet); + rootView.addOnLayoutChangeListener((view, l, t, r, b, oldL, oldT, oldR, oldB) -> { + rootView.setUnrestrictedPreferKeepClearRects( + Collections.singletonList(new Rect(0, 0, r - l, b - t))); + }); } @Override