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

Merge "DO NOT MERGE Allow keyguard_message_area_container to be null" into sc-v2-dev

Browse Source
This commit is contained in:
Alex Stetson
2022-02-08 17:18:15 +00:00
committed by Android (Google) Code Review
parent 0da4077e7d dfcc9a7ffe
commit 6f989effda
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java
View File

@@ -31,6 +31,8 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import com.android.internal.policy.SystemBarUtils; import com.android.internal.policy.SystemBarUtils;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.R; import com.android.systemui.R;
@@ -58,6 +60,11 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp
private ColorStateList mNextMessageColorState = ColorStateList.valueOf(DEFAULT_COLOR); private ColorStateList mNextMessageColorState = ColorStateList.valueOf(DEFAULT_COLOR);
private boolean mBouncerVisible; private boolean mBouncerVisible;
private boolean mAltBouncerShowing; 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 ViewGroup mContainer;
private int mContainerTopMargin; private int mContainerTopMargin;
private int mLastOrientation = -1; private int mLastOrientation = -1;
@@ -77,6 +84,9 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp
} }
void onConfigChanged(Configuration newConfig) { void onConfigChanged(Configuration newConfig) {
if (mContainer == null) {
return;
}
final int newTopMargin = SystemBarUtils.getStatusBarHeight(getContext()); final int newTopMargin = SystemBarUtils.getStatusBarHeight(getContext());
if (mContainerTopMargin != newTopMargin) { if (mContainerTopMargin != newTopMargin) {
mContainerTopMargin = newTopMargin; mContainerTopMargin = newTopMargin;