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

Merge "Reset title message in keyguard when onThemeChanged is called."

Browse Source
This commit is contained in:
Yasin Kilicdere
2023-02-03 10:47:45 +00:00
committed by Android (Google) Code Review
parent e0d7d1dab6 0d2ac3eb8e
commit 02fee8266b
7 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java
View File

@@ -131,6 +131,7 @@ public abstract class KeyguardPinBasedInputViewController<T extends KeyguardPinB
@Override
void resetState() {
mMessageAreaController.setMessage(getInitialMessageResId());
mView.setPasswordEntryEnabled(true);
}

1
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
View File

@@ -247,6 +247,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
@Override
public void onThemeChanged() {
reloadColors();
reset();
}
@Override

6
packages/SystemUI/tests/src/com/android/keyguard/KeyguardPasswordViewControllerTest.kt
View File

@@ -134,4 +134,10 @@ class KeyguardPasswordViewControllerTest : SysuiTestCase() {
keyguardPasswordViewController.startAppearAnimation()
verify(mKeyguardMessageAreaController, never()).setMessage(anyString(), anyBoolean())
}
@Test
fun testMessageIsSetWhenReset() {
keyguardPasswordViewController.resetState()
verify(mKeyguardMessageAreaController).setMessage(R.string.keyguard_enter_your_password)
}
}

6
packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewControllerTest.java
View File

@@ -120,4 +120,10 @@ public class KeyguardPinBasedInputViewControllerTest extends SysuiTestCase {
public void testGetInitialMessageResId() {
assertThat(mKeyguardPinViewController.getInitialMessageResId()).isNotEqualTo(0);
}
@Test
public void testMessageIsSetWhenReset() {
mKeyguardPinViewController.resetState();
verify(mKeyguardMessageAreaController).setMessage(R.string.keyguard_enter_your_pin);
}
}

2
packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java
View File

@@ -583,6 +583,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
verify(mKeyguardSecurityViewFlipperController).clearViews();
verify(mKeyguardSecurityViewFlipperController).getSecurityView(any(SecurityMode.class),
any(KeyguardSecurityCallback.class));
verify(mView).reset();
verify(mKeyguardSecurityViewFlipperController).reset();
}
@Test

6
services/core/java/com/android/server/am/UserController.java
View File

@@ -2246,7 +2246,7 @@ class UserController implements Handler.Callback {
// If there is no challenge set, dismiss the keyguard right away
if (isUserSwitchUiEnabled && !mInjector.getKeyguardManager().isDeviceSecure(newUserId)) {
// Wait until the keyguard is dismissed to unfreeze
mInjector.dismissKeyguard(runnable, "User Switch");
mInjector.dismissKeyguard(runnable);
} else {
runnable.run();
}
@@ -3714,7 +3714,7 @@ class UserController implements Handler.Callback {
return IStorageManager.Stub.asInterface(ServiceManager.getService("mount"));
}
protected void dismissKeyguard(Runnable runnable, String reason) {
protected void dismissKeyguard(Runnable runnable) {
final AtomicBoolean isFirst = new AtomicBoolean(true);
final Runnable runOnce = () -> {
if (isFirst.getAndSet(false)) {
@@ -3738,7 +3738,7 @@ class UserController implements Handler.Callback {
public void onDismissCancelled() throws RemoteException {
mHandler.post(runOnce);
}
}, reason);
}, /* message= */ null);
}
boolean isUsersOnSecondaryDisplaysEnabled() {

6
services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
View File

@@ -412,7 +412,7 @@ public class UserControllerTest {
mInjector.mHandler.clearAllRecordedMessages();
// Verify that continueUserSwitch worked as expected
continueAndCompleteUserSwitch(userState, oldUserId, newUserId);
verify(mInjector, times(0)).dismissKeyguard(any(), anyString());
verify(mInjector, times(0)).dismissKeyguard(any());
verify(mInjector.getWindowManager(), times(1)).stopFreezingScreen();
continueUserSwitchAssertions(oldUserId, TEST_USER_ID, false);
verifySystemUserVisibilityChangesNeverNotified();
@@ -433,7 +433,7 @@ public class UserControllerTest {
mInjector.mHandler.clearAllRecordedMessages();
// Verify that continueUserSwitch worked as expected
continueAndCompleteUserSwitch(userState, oldUserId, newUserId);
verify(mInjector, times(1)).dismissKeyguard(any(), anyString());
verify(mInjector, times(1)).dismissKeyguard(any());
verify(mInjector.getWindowManager(), times(1)).stopFreezingScreen();
continueUserSwitchAssertions(oldUserId, TEST_USER_ID, false);
verifySystemUserVisibilityChangesNeverNotified();
@@ -1148,7 +1148,7 @@ public class UserControllerTest {
}
@Override
protected void dismissKeyguard(Runnable runnable, String reason) {
protected void dismissKeyguard(Runnable runnable) {
runnable.run();
}