Support getDynamicSummary in BasePreferenceController

Adds dynamic summary getter in relevant BasePreferenceControllers.
Preferece controllers that don't have dynamic summaries or which
are not yet BasePreferenceControllers are not changed right now.

Change-Id: I435ccab7758d90515583fd8ca10a9b1ef0c858b9
Fixes: 71514936
Test: robotests
This commit is contained in:
Matthew Fritze
2018-01-02 16:39:39 -08:00
parent ce3633be80
commit c69f73f4d1
14 changed files with 94 additions and 62 deletions

View File

@@ -109,7 +109,19 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
@Override
public void updateState(Preference preference) {
updateDeviceName(preference, mLocalAdapter.getName());
updateDeviceName(preference);
}
@Override
public String getSummary() {
String deviceName = getDeviceName();
if (TextUtils.isEmpty(deviceName)) {
return super.getSummary();
}
return TextUtils.expandTemplate(
mContext.getText(R.string.bluetooth_device_name_summary),
BidiFormatter.getInstance().unicodeWrap(deviceName)).toString();
}
/**
@@ -132,18 +144,14 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
* Update device summary with {@code deviceName}, where {@code deviceName} has accent color
*
* @param preference to set the summary for
* @param deviceName bluetooth device name to show in the summary
*/
protected void updateDeviceName(final Preference preference, final String deviceName) {
if (deviceName == null) {
// TODO: show error message in preference subtitle
return;
}
final CharSequence summary = TextUtils.expandTemplate(
mContext.getText(R.string.bluetooth_device_name_summary),
BidiFormatter.getInstance().unicodeWrap(deviceName));
protected void updateDeviceName(final Preference preference) {
preference.setSelectable(false);
preference.setSummary(summary);
preference.setSummary(getSummary());
}
protected String getDeviceName() {
return mLocalAdapter.getName();
}
/**
@@ -158,7 +166,7 @@ public class BluetoothDeviceNamePreferenceController extends BasePreferenceContr
if (TextUtils.equals(action, BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
if (mPreference != null && mLocalAdapter != null && mLocalAdapter.isEnabled()) {
updateDeviceName(mPreference, mLocalAdapter.getName());
updateDeviceName(mPreference);
}
}
}

View File

@@ -67,8 +67,13 @@ public class BluetoothDeviceRenamePreferenceController extends
}
@Override
protected void updateDeviceName(final Preference preference, final String deviceName) {
preference.setSummary(deviceName);
protected void updateDeviceName(final Preference preference) {
preference.setSummary(getSummary());
}
@Override
public String getSummary() {
return getDeviceName();
}
@Override