PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d

Browse Source 
Change-Id: I4fed17fb3a43035a8d4dd21a16262795a2fd9a9a
This commit is contained in:
Alex Johnston
2020-05-01 10:45:35 +00:00
committed by Automerger Merge Worker
parent 3860223c02 d228e68e5d
commit 3f0c3e900c
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/password/ConfirmLockPassword.java
View File

@@ -159,6 +159,9 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
ConfirmDeviceCredentialBaseFragment.HEADER_TEXT); ConfirmDeviceCredentialBaseFragment.HEADER_TEXT);
CharSequence detailsMessage = intent.getCharSequenceExtra( CharSequence detailsMessage = intent.getCharSequenceExtra(
ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT); ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);
if (TextUtils.isEmpty(headerMessage) && mIsManagedProfile) {
headerMessage = mDevicePolicyManager.getOrganizationNameForUser(mUserId);
}
if (TextUtils.isEmpty(headerMessage)) { if (TextUtils.isEmpty(headerMessage)) {
headerMessage = getString(getDefaultHeader()); headerMessage = getString(getDefaultHeader());
} }

4
src/com/android/settings/password/ConfirmLockPattern.java
View File

@@ -26,6 +26,7 @@ import android.os.CountDownTimer;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserManager; import android.os.UserManager;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -136,6 +137,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
mDetailsText = intent.getCharSequenceExtra( mDetailsText = intent.getCharSequenceExtra(
ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT); ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);
} }
if (TextUtils.isEmpty(mHeaderText) && mIsManagedProfile) {
mHeaderText = mDevicePolicyManager.getOrganizationNameForUser(mUserId);
}
mLockPatternView.setTactileFeedbackEnabled( mLockPatternView.setTactileFeedbackEnabled(
mLockPatternUtils.isTactileFeedbackEnabled()); mLockPatternUtils.isTactileFeedbackEnabled());