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

Password settings: Fix duplicate title

Browse Source 
For the autofill service settings, "Autofill service" is both the
section title and the preference title. This change removes the
duplicate preference title and promotes the app label from the summary
string to the title in its place.

Fix: 192403526
Test: manual - single profile, personal+work profile, change service and
 re-check
Change-Id: Ia012232ba2856e0757289982bc3045d948ff4aa8
This commit is contained in:
Ahaan Ugale
2021-06-29 17:16:25 -07:00
parent 22f6857a6a
commit 437c037830
5 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
View File

@@ -65,11 +65,19 @@ public abstract class DefaultAppPreferenceController extends AbstractPreferenceC
((TwoTargetPreference) preference).setIconSize(ICON_SIZE_MEDIUM);
}
if (!TextUtils.isEmpty(defaultAppLabel)) {
preference.setSummary(defaultAppLabel);
if (showLabelAsTitle()) {
preference.setTitle(defaultAppLabel);
} else {
preference.setSummary(defaultAppLabel);
}
preference.setIcon(Utils.getSafeIcon(getDefaultAppIcon()));
} else {
Log.d(TAG, "No default app");
preference.setSummary(R.string.app_list_preference_none);
if (showLabelAsTitle()) {
preference.setTitle(R.string.app_list_preference_none);
} else {
preference.setSummary(R.string.app_list_preference_none);
}
preference.setIcon(null);
}
mayUpdateGearIcon(app, preference);
@@ -102,6 +110,13 @@ public abstract class DefaultAppPreferenceController extends AbstractPreferenceC
return null;
}
/**
* Whether to show the default app label as the title, instead of as the summary.
*/
protected boolean showLabelAsTitle() {
return false;
}
public Drawable getDefaultAppIcon() {
if (!isAvailable()) {
return null;