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

Commit cf342c95 authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Update work challenge header in Settings" into rvc-dev

parents 7e40584e 439947ae

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

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                        ConfirmDeviceCredentialBaseFragment.HEADER_TEXT);

                CharSequence detailsMessage = intent.getCharSequenceExtra(

                        ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);

                if (TextUtils.isEmpty(headerMessage) && mIsManagedProfile) {

                    headerMessage = mDevicePolicyManager.getOrganizationNameForUser(mUserId);

                }

                if (TextUtils.isEmpty(headerMessage)) {

                    headerMessage = getString(getDefaultHeader());

                }

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

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.CountDownTimer; 
import android.os.SystemClock;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -136,6 +137,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                mDetailsText = intent.getCharSequenceExtra(

                        ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);

            }

            if (TextUtils.isEmpty(mHeaderText) && mIsManagedProfile) {

                mHeaderText = mDevicePolicyManager.getOrganizationNameForUser(mUserId);

            }



            mLockPatternView.setTactileFeedbackEnabled(

                    mLockPatternUtils.isTactileFeedbackEnabled());