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

Commit da3527b4 authored Oct 06, 2022 by Bryce Lee Committed by Automerger Merge Worker Oct 06, 2022

Merge "Allow AuthContainerView to appear over lock screen." into tm-qpr-dev...

Merge "Allow AuthContainerView to appear over lock screen." into tm-qpr-dev am: 021e48b8 am: 22d7d67b

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

Change-Id: I5256bff57d364bd71753937eda7fd80a9dab8cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d90d158e 22d7d67b

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -881,6 +881,7 @@ public class AuthContainerView extends LinearLayout
		static WindowManager.LayoutParams getLayoutParams(IBinder windowToken, CharSequence title) {
		final int windowFlags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED
		\| WindowManager.LayoutParams.FLAG_SECURE
		\| WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
		\| WindowManager.LayoutParams.FLAG_DIM_BEHIND;
		final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
		ViewGroup.LayoutParams.MATCH_PARENT,

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt

+7 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,13 @@ class AuthContainerViewTest : SysuiTestCase() {
		assertThat((layoutParams.flags and WindowManager.LayoutParams.FLAG_SECURE) != 0).isTrue()
		}

		@Test
		fun testLayoutParams_hasShowWhenLockedFlag() {
		val layoutParams = AuthContainerView.getLayoutParams(windowToken, "")
		assertThat((layoutParams.flags and WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED) != 0)
		.isTrue()
		}

		@Test
		fun testLayoutParams_hasDimbehindWindowFlag() {
		val layoutParams = AuthContainerView.getLayoutParams(windowToken, "")