commit 9a839db046b24d79fae6809d85d594596172a78c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 02 02:17:48 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 02 02:17:48 2021 +0000
tree a2bdad01721f5ce9bf322bbc2135fecee8810889
parent 0dbbd148d5fd41d0479b2a5cabdf81fc2f5e791e
parent af149b11fcb9a33722c6b50628057650e50c00c7

Merge "Fix biometric content overlap with top/bottom bars" into sc-dev

src/com/android/settings/biometrics/BiometricEnrollIntroduction.java

diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index 09d8e71..a85382b 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -18,6 +18,8 @@
 
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.os.Bundle;
@@ -25,14 +27,17 @@
 import android.os.UserManager;
 import android.util.Log;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.Utils;
 import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
@@ -183,6 +188,15 @@
     }
 
     @Override
+    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        final LinearLayout buttonContainer = mFooterBarMixin.getButtonContainer();
+        if (buttonContainer != null) {
+            buttonContainer.setBackgroundColor(getBackgroundColor());
+        }
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
 
@@ -200,6 +214,12 @@
     }
 
     @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        getWindow().setStatusBarColor(getBackgroundColor());
+    }
+
+    @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean(KEY_CONFIRMING_CREDENTIALS, mConfirmingCredentials);
@@ -335,4 +355,10 @@
         }
         return mIconColorFilter;
     }
+
+    @ColorInt
+    private int getBackgroundColor() {
+        final ColorStateList stateList = Utils.getColorAttr(this, android.R.attr.windowBackground);
+        return stateList != null ? stateList.getDefaultColor() : Color.TRANSPARENT;
+    }
 }