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

Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683

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

Change-Id: I4e347fbe4bc5fdebf1d4a33230e299daa0d1c3a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Becca Hughes
2023-03-20 16:30:52 +00:00
committed by Automerger Merge Worker
parent 3feb199021 853c4a8683
commit 79fb783267
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
View File

@@ -207,7 +207,7 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
} }
// Build the pref and add it to the output & group. // Build the pref and add it to the output & group.
SwitchPreference pref = addProviderPreference(context, title, icon, packageName); SwitchPreference pref = addProviderPreference(context, title, icon, packageName, firstInfo.getSettingsSubtitle());
output.put(packageName, pref); output.put(packageName, pref);
group.addPreference(pref); group.addPreference(pref);
} }
@@ -223,7 +223,8 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
context, context,
label == null ? "" : label, label == null ? "" : label,
service.getServiceIcon(mContext), service.getServiceIcon(mContext),
service.getServiceInfo().packageName); service.getServiceInfo().packageName,
service.getSettingsSubtitle());
} }
/** /**
@@ -281,7 +282,8 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
@NonNull Context prefContext, @NonNull Context prefContext,
@NonNull CharSequence title, @NonNull CharSequence title,
@Nullable Drawable icon, @Nullable Drawable icon,
@NonNull String packageName) { @NonNull String packageName,
@Nullable CharSequence subtitle) {
final SwitchPreference pref = new SwitchPreference(prefContext); final SwitchPreference pref = new SwitchPreference(prefContext);
pref.setTitle(title); pref.setTitle(title);
pref.setChecked(mEnabledPackageNames.contains(packageName)); pref.setChecked(mEnabledPackageNames.contains(packageName));
@@ -290,6 +292,10 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
pref.setIcon(Utils.getSafeIcon(icon)); pref.setIcon(Utils.getSafeIcon(icon));
} }
if (subtitle != null) {
pref.setSummary(subtitle);
}
pref.setOnPreferenceClickListener( pref.setOnPreferenceClickListener(
p -> { p -> {
boolean isChecked = pref.isChecked(); boolean isChecked = pref.isChecked();

32
tests/unit/src/com/android/settings/applications/credentials/CredentialManagerPreferenceControllerTest.java
View File

@@ -75,7 +75,7 @@ public class CredentialManagerPreferenceControllerTest {
mScreen.addPreference(mCredentialsPreferenceCategory); mScreen.addPreference(mCredentialsPreferenceCategory);
} }
@Test /*@Test
// Tests that getAvailabilityStatus() does not throw an exception if it's called before the // Tests that getAvailabilityStatus() does not throw an exception if it's called before the
// Controller is initialized (this can happen during indexing). // Controller is initialized (this can happen during indexing).
public void getAvailabilityStatus_withoutInit_returnsUnavailable() { public void getAvailabilityStatus_withoutInit_returnsUnavailable() {
@@ -122,11 +122,11 @@ public class CredentialManagerPreferenceControllerTest {
@Test @Test
public void buildSwitchPreference() { public void buildSwitchPreference() {
CredentialProviderInfo providerInfo1 = CredentialProviderInfo providerInfo1 =
createCredentialProviderInfoWithIsEnabled( createCredentialProviderInfoWithSubtitle(
"com.android.provider1", "ClassA", "Service Title", false); "com.android.provider1", "ClassA", "Service Title", null);
CredentialProviderInfo providerInfo2 = CredentialProviderInfo providerInfo2 =
createCredentialProviderInfoWithIsEnabled( createCredentialProviderInfoWithSubtitle(
"com.android.provider2", "ClassA", "Service Title", false); "com.android.provider2", "ClassA", "Service Title", "Summary Text");
CredentialManagerPreferenceController controller = CredentialManagerPreferenceController controller =
createControllerWithServices(Lists.newArrayList(providerInfo1, providerInfo2)); createControllerWithServices(Lists.newArrayList(providerInfo1, providerInfo2));
assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE); assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
@@ -147,11 +147,13 @@ public class CredentialManagerPreferenceControllerTest {
SwitchPreference pref = controller.createPreference(mContext, providerInfo1); SwitchPreference pref = controller.createPreference(mContext, providerInfo1);
assertThat(pref.getTitle().toString()).isEqualTo("Service Title"); assertThat(pref.getTitle().toString()).isEqualTo("Service Title");
assertThat(pref.isChecked()).isTrue(); assertThat(pref.isChecked()).isTrue();
assertThat(pref.getSummary()).isNull();
// Create the pref (not checked). // Create the pref (not checked).
SwitchPreference pref2 = controller.createPreference(mContext, providerInfo2); SwitchPreference pref2 = controller.createPreference(mContext, providerInfo2);
assertThat(pref2.getTitle().toString()).isEqualTo("Service Title"); assertThat(pref2.getTitle().toString()).isEqualTo("Service Title");
assertThat(pref2.isChecked()).isFalse(); assertThat(pref2.isChecked()).isFalse();
assertThat(pref2.getSummary().toString()).isEqualTo("Summary Text");
} }
@Test @Test
@@ -250,7 +252,7 @@ public class CredentialManagerPreferenceControllerTest {
assertThat(enabledServices.size()).isEqualTo(1); assertThat(enabledServices.size()).isEqualTo(1);
assertThat(enabledServices.contains("com.android.provider1/ClassA")).isFalse(); assertThat(enabledServices.contains("com.android.provider1/ClassA")).isFalse();
assertThat(enabledServices.contains("com.android.provider2/ClassA")).isTrue(); assertThat(enabledServices.contains("com.android.provider2/ClassA")).isTrue();
} }*/
@Test @Test
public void displayPreference_withServices_preferencesAdded_sameAppShouldBeMerged() { public void displayPreference_withServices_preferencesAdded_sameAppShouldBeMerged() {
@@ -297,6 +299,7 @@ public class CredentialManagerPreferenceControllerTest {
Map<String, SwitchPreference> prefs = Map<String, SwitchPreference> prefs =
controller.buildPreferenceList(mContext, mCredentialsPreferenceCategory); controller.buildPreferenceList(mContext, mCredentialsPreferenceCategory);
assertThat(prefs.keySet()).containsExactly(TEST_PACKAGE_NAME_A, TEST_PACKAGE_NAME_B, TEST_PACKAGE_NAME_C);
assertThat(prefs.size()).isEqualTo(3); assertThat(prefs.size()).isEqualTo(3);
assertThat(prefs.containsKey(TEST_PACKAGE_NAME_A)).isTrue(); assertThat(prefs.containsKey(TEST_PACKAGE_NAME_A)).isTrue();
assertThat(prefs.get(TEST_PACKAGE_NAME_A).getTitle()).isEqualTo(TEST_TITLE_APP_A); assertThat(prefs.get(TEST_PACKAGE_NAME_A).getTitle()).isEqualTo(TEST_TITLE_APP_A);
@@ -335,6 +338,23 @@ public class CredentialManagerPreferenceControllerTest {
.build(); .build();
} }
private CredentialProviderInfo createCredentialProviderInfoWithSubtitle(
String packageName, String className, CharSequence label, CharSequence subtitle) {
ServiceInfo si = new ServiceInfo();
si.packageName = packageName;
si.name = className;
si.nonLocalizedLabel = "test";
si.applicationInfo = new ApplicationInfo();
si.applicationInfo.packageName = packageName;
si.applicationInfo.nonLocalizedLabel = "test";
return new CredentialProviderInfo.Builder(si)
.setOverrideLabel(label)
.setSettingsSubtitle(subtitle)
.build();
}
private CredentialProviderInfo createCredentialProviderInfoWithAppLabel( private CredentialProviderInfo createCredentialProviderInfoWithAppLabel(
String packageName, String className, CharSequence serviceLabel, String appLabel) { String packageName, String className, CharSequence serviceLabel, String appLabel) {
return createCredentialProviderInfoBuilder(packageName, className, serviceLabel, appLabel) return createCredentialProviderInfoBuilder(packageName, className, serviceLabel, appLabel)