Merge "Allow AuthContainerView to appear over lock screen." into tm-qpr-dev am: 021e48b856
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20075303 Change-Id: I17b94b51cc8d7c3c9dd25fd2d64b8b39d1d77605 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -875,6 +875,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,
|
||||
|
||||
@@ -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, "")
|
||||
|
||||
Reference in New Issue
Block a user