Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
9209ce852a
@@ -372,10 +372,25 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
|
|||||||
|
|
||||||
if (mDialogId == CALLS_PICK) {
|
if (mDialogId == CALLS_PICK) {
|
||||||
holder.title.setText(getItem(position));
|
holder.title.setText(getItem(position));
|
||||||
holder.summary.setText("");
|
if (position == 0) {
|
||||||
holder.icon.setImageDrawable(getResources()
|
holder.icon.setImageDrawable(getResources()
|
||||||
.getDrawable(R.drawable.ic_live_help));
|
.getDrawable(R.drawable.ic_live_help));
|
||||||
holder.icon.setAlpha(OPACITY);
|
holder.icon.setAlpha(OPACITY);
|
||||||
|
holder.summary.setText("");
|
||||||
|
} else {
|
||||||
|
final TelecomManager telecomManager = TelecomManager.from(getActivity());
|
||||||
|
final Iterator<PhoneAccountHandle> phoneAccounts =
|
||||||
|
telecomManager.getCallCapablePhoneAccounts().listIterator();
|
||||||
|
while (phoneAccounts.hasNext()) {
|
||||||
|
final PhoneAccount phoneAccount =
|
||||||
|
telecomManager.getPhoneAccount(phoneAccounts.next());
|
||||||
|
if (getItem(position).equals((String) phoneAccount.getLabel())) {
|
||||||
|
holder.icon.setImageBitmap(phoneAccount.getIconBitmap());
|
||||||
|
holder.summary
|
||||||
|
.setText(phoneAccount.getAddress().getSchemeSpecificPart());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
sir = mSelectableSubInfos.get(position);
|
sir = mSelectableSubInfos.get(position);
|
||||||
holder.title.setText(sir.getDisplayName());
|
holder.title.setText(sir.getDisplayName());
|
||||||
|
Reference in New Issue
Block a user