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

Commit 184edb54 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] DO NOT MERGE Allow keyguard_message_area_container to be null 2p: dfcc9a7f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16791767

Bug: 213476245
Bug: 217926975
Change-Id: If8100125fdf555a0b916f39db3b18afabc730075
parents 1e4a85aa dfcc9a7f

packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.view.View; 
import android.view.ViewGroup;

import android.widget.TextView;



import androidx.annotation.Nullable;



import com.android.internal.policy.SystemBarUtils;

import com.android.settingslib.Utils;

import com.android.systemui.R;
@@ -58,6 +60,11 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp 
    private ColorStateList mNextMessageColorState = ColorStateList.valueOf(DEFAULT_COLOR);

    private boolean mBouncerVisible;

    private boolean mAltBouncerShowing;

    /**

     * Container that wraps the KeyguardMessageArea - may be null if current view hierarchy doesn't

     * contain {@link R.id.keyguard_message_area_container}.

     */

    @Nullable

    private ViewGroup mContainer;

    private int mContainerTopMargin;

    private int mLastOrientation = -1;
@@ -77,6 +84,9 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp 
    }



    void onConfigChanged(Configuration newConfig) {

        if (mContainer == null) {

            return;

        }

        final int newTopMargin = SystemBarUtils.getStatusBarHeight(getContext());

        if (mContainerTopMargin != newTopMargin) {

            mContainerTopMargin = newTopMargin;