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

Merge "Credential Manager Settings Improvement Bug fixes" into main

Browse Source
This commit is contained in:
Joy Babafemi
2025-01-21 11:12:25 -08:00
committed by Android (Google) Code Review
parent 968807c3bc d3807e554d
commit 64769aae17
16 changed files with 136 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/src/com/android/settings/applications/credentials/CredentialsPickerActivityTest.java
View File

@@ -57,7 +57,7 @@ public class CredentialsPickerActivityTest {
@Test
public void testInjectFragmentIntoIntent_normalProfile() {
Intent intent = new Intent();
CredentialsPickerActivity.injectFragmentIntoIntent(mMockContext, intent);
CredentialsPickerActivity.injectFragmentIntoIntent(mMockContext, intent, 10);
assertThat(intent.getStringExtra(CredentialsPickerActivity.EXTRA_SHOW_FRAGMENT))
.isEqualTo(DefaultCombinedPicker.class.getName());
}
@@ -70,7 +70,7 @@ public class CredentialsPickerActivityTest {
when(mUserManager.isManagedProfile(anyInt())).thenReturn(true);
assertThat(DefaultCombinedPickerWork.isUserHandledByFragment(mUserManager, 10)).isTrue();
CredentialsPickerActivity.injectFragmentIntoIntent(mMockContext, intent);
CredentialsPickerActivity.injectFragmentIntoIntent(mMockContext, intent, 10);
assertThat(intent.getStringExtra(CredentialsPickerActivity.EXTRA_SHOW_FRAGMENT))
.isEqualTo(DefaultCombinedPickerWork.class.getName());
}
@@ -84,7 +84,7 @@ public class CredentialsPickerActivityTest {
doReturn(true).when(mUserManager).isPrivateProfile();
assertThat(DefaultCombinedPickerPrivate.isUserHandledByFragment(mUserManager)).isTrue();
CredentialsPickerActivity.injectFragmentIntoIntent(mMockContext, intent);
CredentialsPickerActivity.injectFragmentIntoIntent(mMockContext, intent, 10);
assertThat(intent.getStringExtra(CredentialsPickerActivity.EXTRA_SHOW_FRAGMENT))
.isEqualTo(DefaultCombinedPickerPrivate.class.getName());
}

6
tests/unit/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceControllerTest.java
View File

@@ -69,7 +69,7 @@ public class DefaultCombinedPreferenceControllerTest {
// The setting intent should be null for the new design since this
// is handled by the delegate for the PrimaryProviderPreference.
DefaultCombinedPreferenceController dcpc =
new DefaultCombinedPreferenceController(mContext);
new DefaultCombinedPreferenceController(mContext, false, false);
assertThat(dcpc.getSettingIntent(null).getPackage()).isNull();
}
@@ -81,7 +81,7 @@ public class DefaultCombinedPreferenceControllerTest {
// For the old design the setting intent should still be used.
DefaultCombinedPreferenceController dcpc =
new DefaultCombinedPreferenceController(mContext);
new DefaultCombinedPreferenceController(mContext, false, false);
assertThat(dcpc.getSettingIntent(null).getPackage()).isNotNull();
}
@@ -104,7 +104,7 @@ public class DefaultCombinedPreferenceControllerTest {
}
DefaultCombinedPreferenceController dcpc =
new DefaultCombinedPreferenceController(mContext);
new DefaultCombinedPreferenceController(mContext, false, false);
PrimaryProviderPreference ppp = createTestPreference();
Drawable appIcon = mContext.getResources().getDrawable(R.drawable.ic_settings_delete);