diff options
| -rw-r--r-- | packages/SystemUI/res/layout/keyguard_bottom_area.xml | 9 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index ef9cf4af5844..52441221e714 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -91,6 +91,13 @@ android:scaleType="center" android:tint="?attr/bgProtectTextColor" /> - <include layout="@layout/keyguard_bottom_area_overlay" /> + <FrameLayout + android:id="@+id/overlay_container" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/keyguard_bottom_area_overlay" /> + + </FrameLayout> </com.android.systemui.statusbar.phone.KeyguardBottomAreaView> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index e9aa6d2e6b0b..a3e5e45a1ef7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -126,6 +126,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL private TextView mEnterpriseDisclosure; private TextView mIndicationText; private ViewGroup mPreviewContainer; + private ViewGroup mOverlayContainer; private View mLeftPreview; private View mCameraPreview; @@ -229,6 +230,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL super.onFinishInflate(); mLockPatternUtils = new LockPatternUtils(mContext); mPreviewContainer = findViewById(R.id.preview_container); + mOverlayContainer = findViewById(R.id.overlay_container); mRightAffordanceView = findViewById(R.id.camera_button); mLeftAffordanceView = findViewById(R.id.left_button); mLockIcon = findViewById(R.id.lock_icon); @@ -821,8 +823,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL if (dozing) { mLockIcon.setVisibility(INVISIBLE); + mOverlayContainer.setVisibility(INVISIBLE); } else { mLockIcon.setVisibility(VISIBLE); + mOverlayContainer.setVisibility(VISIBLE); if (animate) { startFinishDozeAnimation(); } |