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

Commit c7e83937 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Set the light status bar flag if not in dark mode" into udc-qpr-dev am: bf7b928f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726369



Change-Id: I37bd5e0669292a784478ddd748b8c51c5947cd06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3a06d46 bf7b928f

src/com/android/settings/password/ConfirmDeviceCredentialActivity.java

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_W 
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PASSWORD;

import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN;

import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PIN;

import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;



import android.app.Activity;

import android.app.KeyguardManager;
@@ -32,6 +33,7 @@ import android.app.trust.TrustManager; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.graphics.Color;

import android.hardware.biometrics.BiometricConstants;

import android.hardware.biometrics.BiometricPrompt;
@@ -379,6 +381,12 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { 
        // Translucent activity that is "visible", so it doesn't complain about finish()

        // not being called before onResume().

        setVisible(true);



        if ((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)

                != Configuration.UI_MODE_NIGHT_YES) {

            getWindow().getInsetsController().setSystemBarsAppearance(

                    APPEARANCE_LIGHT_STATUS_BARS, APPEARANCE_LIGHT_STATUS_BARS);

        }

    }



    @Override