Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide the Keyguard bottom area overlay when dozing." into oc-dr1-dev

Browse Source
This commit is contained in:
Philip Quinn
2017-07-11 16:44:49 +00:00
committed by Android (Google) Code Review
parent 1cd7e7a431 b86efa4af5
commit 2b6d358d55
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -91,6 +91,13 @@
android:scaleType="center" android:scaleType="center"
android:tint="?attr/bgProtectTextColor" /> android:tint="?attr/bgProtectTextColor" />
<FrameLayout
android:id="@+id/overlay_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/keyguard_bottom_area_overlay" /> <include layout="@layout/keyguard_bottom_area_overlay" />
</FrameLayout>
</com.android.systemui.statusbar.phone.KeyguardBottomAreaView> </com.android.systemui.statusbar.phone.KeyguardBottomAreaView>

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View File

@@ -126,6 +126,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
private TextView mEnterpriseDisclosure; private TextView mEnterpriseDisclosure;
private TextView mIndicationText; private TextView mIndicationText;
private ViewGroup mPreviewContainer; private ViewGroup mPreviewContainer;
private ViewGroup mOverlayContainer;
private View mLeftPreview; private View mLeftPreview;
private View mCameraPreview; private View mCameraPreview;
@@ -229,6 +230,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
super.onFinishInflate(); super.onFinishInflate();
mLockPatternUtils = new LockPatternUtils(mContext); mLockPatternUtils = new LockPatternUtils(mContext);
mPreviewContainer = findViewById(R.id.preview_container); mPreviewContainer = findViewById(R.id.preview_container);
mOverlayContainer = findViewById(R.id.overlay_container);
mRightAffordanceView = findViewById(R.id.camera_button); mRightAffordanceView = findViewById(R.id.camera_button);
mLeftAffordanceView = findViewById(R.id.left_button); mLeftAffordanceView = findViewById(R.id.left_button);
mLockIcon = findViewById(R.id.lock_icon); mLockIcon = findViewById(R.id.lock_icon);
@@ -821,8 +823,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
if (dozing) { if (dozing) {
mLockIcon.setVisibility(INVISIBLE); mLockIcon.setVisibility(INVISIBLE);
mOverlayContainer.setVisibility(INVISIBLE);
} else { } else {
mLockIcon.setVisibility(VISIBLE); mLockIcon.setVisibility(VISIBLE);
mOverlayContainer.setVisibility(VISIBLE);
if (animate) { if (animate) {
startFinishDozeAnimation(); startFinishDozeAnimation();
} }