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

Commit dc5ef753 authored by Philip Quinn's avatar Philip Quinn Committed by android-build-merger
Browse files

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

am: 2b6d358d

Change-Id: Id8de1f9a19f39a5869b7eb6efda16dfe7c163815
parents e24219c2 2b6d358d

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+8 −1
Original line number Original line Diff line number Diff line
@@ -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>

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

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

            }

            }