Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b6d358d authored by Philip Quinn's avatar Philip Quinn Committed by Android (Google) Code Review
Browse files

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

parents 1cd7e7a4 b86efa4a

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+8 −1
Original line number Diff line number Diff line
@@ -91,6 +91,13 @@ 
        android:scaleType="center"

        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" />



    </FrameLayout>



</com.android.systemui.statusbar.phone.KeyguardBottomAreaView>

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

+4 −0
Original line number Diff line number Diff line
@@ -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();

            }