Merge "Clean up updateState()"
This commit is contained in:
committed by
Android (Google) Code Review
commit
2b80334b41
@@ -74,18 +74,7 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int numDevices = mConnectedDevices.size();
|
final int numDevices = mConnectedDevices.size();
|
||||||
if (numDevices == 0) {
|
mPreference.setVisible((numDevices == 0) ? false : true);
|
||||||
// Disable switch entry if there is no connected devices.
|
|
||||||
mPreference.setVisible(false);
|
|
||||||
final CharSequence summary = mContext.getText(R.string.media_output_default_summary);
|
|
||||||
final CharSequence[] defaultMediaOutput = new CharSequence[]{summary};
|
|
||||||
mSelectedIndex = getDefaultDeviceIndex();
|
|
||||||
preference.setSummary(summary);
|
|
||||||
setPreference(defaultMediaOutput, defaultMediaOutput, preference);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mPreference.setVisible(true);
|
|
||||||
CharSequence[] mediaOutputs = new CharSequence[numDevices + 1];
|
CharSequence[] mediaOutputs = new CharSequence[numDevices + 1];
|
||||||
CharSequence[] mediaValues = new CharSequence[numDevices + 1];
|
CharSequence[] mediaValues = new CharSequence[numDevices + 1];
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user