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

Merge "Fixed then icons of SIMs in the call dialog." into lmp-mr1-dev

Browse Source
This commit is contained in:
PauloftheWest
2014-12-15 22:46:57 +00:00
committed by Android (Google) Code Review
parent e04fd76f1c a886d69f9d
commit c6f5c924d8
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/sim/SimDialogActivity.java
View File

@@ -200,16 +200,26 @@ public class SimDialogActivity extends Activity {
} }
}; };
ArrayList<SubscriptionInfo> callsSubInfoList = new ArrayList<SubscriptionInfo>();
if (id == CALLS_PICK) { if (id == CALLS_PICK) {
final TelecomManager telecomManager = TelecomManager.from(context); final TelecomManager telecomManager = TelecomManager.from(context);
final Iterator<PhoneAccountHandle> phoneAccounts = final Iterator<PhoneAccountHandle> phoneAccounts =
telecomManager.getCallCapablePhoneAccounts().listIterator(); telecomManager.getCallCapablePhoneAccounts().listIterator();
list.add(getResources().getString(R.string.sim_calls_ask_first_prefs_title)); list.add(getResources().getString(R.string.sim_calls_ask_first_prefs_title));
callsSubInfoList.add(null);
while (phoneAccounts.hasNext()) { while (phoneAccounts.hasNext()) {
final PhoneAccount phoneAccount = final PhoneAccount phoneAccount =
telecomManager.getPhoneAccount(phoneAccounts.next()); telecomManager.getPhoneAccount(phoneAccounts.next());
list.add((String)phoneAccount.getLabel()); list.add((String)phoneAccount.getLabel());
if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
final String phoneAccountId = phoneAccount.getAccountHandle().getId();
final SubscriptionInfo sir = Utils.findRecordBySubId(context,
Integer.parseInt(phoneAccountId));
callsSubInfoList.add(sir);
} else {
callsSubInfoList.add(null);
}
} }
} else { } else {
for (int i = 0; i < selectableSubInfoLength; ++i) { for (int i = 0; i < selectableSubInfoLength; ++i) {
@@ -227,7 +237,7 @@ public class SimDialogActivity extends Activity {
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);
ListAdapter adapter = new SelectAccountListAdapter( ListAdapter adapter = new SelectAccountListAdapter(
subInfoList, id == CALLS_PICK ? callsSubInfoList : subInfoList,
builder.getContext(), builder.getContext(),
R.layout.select_account_list_item, R.layout.select_account_list_item,
arr, id); arr, id);
@@ -276,7 +286,6 @@ public class SimDialogActivity extends Activity {
mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View rowView; View rowView;
final ViewHolder holder; final ViewHolder holder;
SubscriptionInfo sir;
if (convertView == null) { if (convertView == null) {
// Cache views for faster scrolling // Cache views for faster scrolling
@@ -291,14 +300,14 @@ public class SimDialogActivity extends Activity {
holder = (ViewHolder) rowView.getTag(); holder = (ViewHolder) rowView.getTag();
} }
if (mDialogId == CALLS_PICK) { final SubscriptionInfo sir = mSubInfoList.get(position);
if (sir == null) {
holder.title.setText(getItem(position)); holder.title.setText(getItem(position));
holder.summary.setText(""); holder.summary.setText("");
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);
} else { } else {
sir = mSubInfoList.get(position);
holder.title.setText(sir.getDisplayName()); holder.title.setText(sir.getDisplayName());
holder.summary.setText(sir.getNumber()); holder.summary.setText(sir.getNumber());
holder.icon.setImageBitmap(sir.createIconBitmap(mContext)); holder.icon.setImageBitmap(sir.createIconBitmap(mContext));