Add lock icon to bouncer when scrimmed
Lock icon needs to be reparented to the bouncer when we're
asking for a pin on top of the notification panel, since the
scrim would cove the whole lock screen.
Fixes: 129160870
Test: atest KeyguardBouncerTest
Test: atest StatusBarKeyguardViewManagerTest
Test: double tap notification
Test: swipe up to unlock
Test: swipe to shade locked, tap notification
Test: repeat with and without pin
Change-Id: I476ab2822da0040cfcfe7f8bc775b76407f0c613
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index adc0b41..636b929 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -77,15 +77,20 @@
android:contentDescription="@string/accessibility_phone_button"
android:tint="?attr/wallpaperTextColor" />
- <com.android.systemui.statusbar.phone.LockIcon
- android:id="@+id/lock_icon"
+ <FrameLayout
+ android:id="@+id/lock_icon_container"
android:layout_width="@dimen/keyguard_lock_width"
android:layout_height="@dimen/keyguard_lock_height"
android:layout_gravity="bottom|center_horizontal"
- android:layout_marginBottom="@dimen/keyguard_lock_padding"
- android:src="@*android:drawable/ic_lock"
- android:contentDescription="@string/accessibility_unlock_button"
- android:scaleType="center" />
+ android:layout_marginBottom="@dimen/keyguard_lock_padding">
+ <com.android.systemui.statusbar.phone.LockIcon
+ android:id="@+id/lock_icon"
+ android:layout_width="@dimen/keyguard_lock_width"
+ android:layout_height="@dimen/keyguard_lock_height"
+ android:src="@*android:drawable/ic_lock"
+ android:contentDescription="@string/accessibility_unlock_button"
+ android:scaleType="center" />
+ </FrameLayout>
<FrameLayout
android:id="@+id/overlay_container"