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

Merge "Fix errorprone warnings that should be errors" am: 5744d7c560 am: 7094507528 am: 778ef161bb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255054

Change-Id: I1f3cbce7d5de6e63477bc2da2ad115ec53b06472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-01 00:02:10 +00:00
committed by Automerger Merge Worker
parent 425b87090f 778ef161bb
commit 9040efdccc
23 changed files with 114 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
View File

@@ -43,16 +43,16 @@ public class ConfirmCredentialTest {
// Launch only one instance at a time.
assertThat(LastTryDialog.show(
fm, "title", mContext.getString(android.R.string.yes),
fm, "title", mContext.getString(android.R.string.ok),
android.R.string.ok, false)).isTrue();
assertThat(LastTryDialog.show(
fm, "title", mContext.getString(android.R.string.yes),
fm, "title", mContext.getString(android.R.string.ok),
android.R.string.ok, false)).isFalse();
// After cancelling, the dialog should be re-shown when asked for.
LastTryDialog.hide(fm);
assertThat(LastTryDialog.show(
fm, "title", mContext.getString(android.R.string.yes),
fm, "title", mContext.getString(android.R.string.ok),
android.R.string.ok, false)).isTrue();
}
}