Merge "Allow AuthContainerView to appear over lock screen." into tm-qpr-dev
This commit is contained in:
@@ -875,6 +875,7 @@ public class AuthContainerView extends LinearLayout
|
|||||||
static WindowManager.LayoutParams getLayoutParams(IBinder windowToken, CharSequence title) {
|
static WindowManager.LayoutParams getLayoutParams(IBinder windowToken, CharSequence title) {
|
||||||
final int windowFlags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED
|
final int windowFlags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED
|
||||||
| WindowManager.LayoutParams.FLAG_SECURE
|
| WindowManager.LayoutParams.FLAG_SECURE
|
||||||
|
| WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
|
||||||
| WindowManager.LayoutParams.FLAG_DIM_BEHIND;
|
| WindowManager.LayoutParams.FLAG_DIM_BEHIND;
|
||||||
final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
|
final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
|
||||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
ViewGroup.LayoutParams.MATCH_PARENT,
|
||||||
|
|||||||
@@ -321,6 +321,13 @@ class AuthContainerViewTest : SysuiTestCase() {
|
|||||||
assertThat((layoutParams.flags and WindowManager.LayoutParams.FLAG_SECURE) != 0).isTrue()
|
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
|
@Test
|
||||||
fun testLayoutParams_hasDimbehindWindowFlag() {
|
fun testLayoutParams_hasDimbehindWindowFlag() {
|
||||||
val layoutParams = AuthContainerView.getLayoutParams(windowToken, "")
|
val layoutParams = AuthContainerView.getLayoutParams(windowToken, "")
|
||||||
|
|||||||
Reference in New Issue
Block a user