Change PreferenceController#getSummary return type.
Return CharSequence instead of String. All user visible string should be modeled as CharSequence. Bug: 73950519 Test: robotest Change-Id: I30befef0c33f94351d4a2774e283bd1ed804aa8b
This commit is contained in:
@@ -64,7 +64,7 @@ public class AppPermissionsPreferenceController extends AbstractPreferenceContro
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
final String summary = getSummary();
|
||||
final CharSequence summary = getSummary();
|
||||
if (summary != null) {
|
||||
preference.setSummary(summary);
|
||||
}
|
||||
@@ -76,7 +76,7 @@ public class AppPermissionsPreferenceController extends AbstractPreferenceContro
|
||||
Location, Microphone, Camera, Sms, Contacts, and Phone
|
||||
*/
|
||||
@Override
|
||||
public String getSummary() {
|
||||
public CharSequence getSummary() {
|
||||
final Set<String> permissions = getAllPermissionsInGroups();
|
||||
Set<String> grantedPermissionGroups = getGrantedPermissionGroups(permissions);
|
||||
CharSequence summary = null;
|
||||
|
||||
@@ -55,9 +55,9 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSummary() {
|
||||
public CharSequence getSummary() {
|
||||
int summaryResId = isDefaultApp() ? R.string.yes : R.string.no;
|
||||
return mContext.getString(summaryResId);
|
||||
return mContext.getText(summaryResId);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -61,7 +61,7 @@ public class DrawOverlayDetailPreferenceController extends AppInfoPreferenceCont
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSummary() {
|
||||
return DrawOverlayDetails.getSummary(mContext, mParent.getAppEntry()).toString();
|
||||
public CharSequence getSummary() {
|
||||
return DrawOverlayDetails.getSummary(mContext, mParent.getAppEntry());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,8 +62,8 @@ public class WriteSystemSettingsPreferenceController extends AppInfoPreferenceCo
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSummary() {
|
||||
return WriteSettingsDetails.getSummary(mContext, mParent.getAppEntry()).toString();
|
||||
public CharSequence getSummary() {
|
||||
return WriteSettingsDetails.getSummary(mContext, mParent.getAppEntry());
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user