From b9558d91dfcae4cd98f2e25dd070dfa8c926d524 Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Tue, 25 Mar 2014 12:21:30 -0700 Subject: [PATCH] Refactor SmsListPreference into AppListPreference. This generalizes the pattern of needing to offer a selection among a list of candidate applications. Also move some reusable logic around querying PackageManager for icons into AppListPreference, and remove some unnecessary update logic: the preference will update itself when onPreferenceChange returns true, and we can set the summary to '%s' to automatically use the entry as the summary without having to reset it each time. Change-Id: I007b9ed58359302f93b367a4b86354e93613bf3e --- ...rence_item.xml => app_preference_item.xml} | 4 +- res/xml/wireless_settings.xml | 3 +- ...Preference.java => AppListPreference.java} | 68 ++++++++++++++----- .../android/settings/WirelessSettings.java | 47 +++---------- 4 files changed, 64 insertions(+), 58 deletions(-) rename res/layout/{sms_preference_item.xml => app_preference_item.xml} (95%) rename src/com/android/settings/{SmsListPreference.java => AppListPreference.java} (50%) diff --git a/res/layout/sms_preference_item.xml b/res/layout/app_preference_item.xml similarity index 95% rename from res/layout/sms_preference_item.xml rename to res/layout/app_preference_item.xml index 21467640af9..22ee37e0270 100755 --- a/res/layout/sms_preference_item.xml +++ b/res/layout/app_preference_item.xml @@ -21,13 +21,13 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:padding="6dip"> - { + public class AppArrayAdapter extends ArrayAdapter { private Drawable[] mImageDrawables = null; private int mSelectedIndex = 0; - public SmsArrayAdapter(Context context, int textViewResourceId, + public AppArrayAdapter(Context context, int textViewResourceId, CharSequence[] objects, Drawable[] imageDrawables, int selectedIndex) { super(context, textViewResourceId, objects); mSelectedIndex = selectedIndex; mImageDrawables = imageDrawables; } + @Override public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = ((Activity)getContext()).getLayoutInflater(); - View view = inflater.inflate(R.layout.sms_preference_item, parent, false); - CheckedTextView checkedTextView = (CheckedTextView)view.findViewById(R.id.sms_text); + View view = inflater.inflate(R.layout.app_preference_item, parent, false); + CheckedTextView checkedTextView = (CheckedTextView)view.findViewById(R.id.app_label); checkedTextView.setText(getItem(position)); if (position == mSelectedIndex) { checkedTextView.setChecked(true); } - ImageView imageView = (ImageView)view.findViewById(R.id.sms_image); + ImageView imageView = (ImageView)view.findViewById(R.id.app_image); imageView.setImageDrawable(mImageDrawables[position]); return view; } } - public SmsListPreference(Context context, AttributeSet attrs) { + public AppListPreference(Context context, AttributeSet attrs) { super(context, attrs); } - public void setEntryDrawables(Drawable[] entries) { - mEntryDrawables = entries; - } + public void setPackageNames(String[] packageNames, String defaultPackageName) { + // Look up all package names in PackageManager. Skip ones we can't find. + int foundPackages = 0; + PackageManager pm = getContext().getPackageManager(); + ApplicationInfo[] appInfos = new ApplicationInfo[packageNames.length]; + for (int i = 0; i < packageNames.length; i++) { + try { + appInfos[i] = pm.getApplicationInfo(packageNames[i], 0); + foundPackages++; + } catch (NameNotFoundException e) { + // Leave appInfos[i] uninitialized; it will be skipped in the list. + } + } - public Drawable[] getEntryDrawables() { - return mEntryDrawables; + // Show the label and icon for each application package. + CharSequence[] applicationNames = new CharSequence[foundPackages]; + mEntryDrawables = new Drawable[foundPackages]; + int index = 0; + int selectedIndex = -1; + for (ApplicationInfo appInfo : appInfos) { + if (appInfo != null) { + applicationNames[index] = appInfo.loadLabel(pm); + mEntryDrawables[index] = appInfo.loadIcon(pm); + if (appInfo.packageName.contentEquals(defaultPackageName)) { + selectedIndex = index; + } + index++; + } + } + setEntries(applicationNames); + setEntryValues(packageNames); + if (selectedIndex != -1) { + setValueIndex(selectedIndex); + } } @Override protected void onPrepareDialogBuilder(Builder builder) { int selectedIndex = findIndexOfValue(getValue()); - ListAdapter adapter = new SmsArrayAdapter(getContext(), - R.layout.sms_preference_item, getEntries(), mEntryDrawables, selectedIndex); + ListAdapter adapter = new AppArrayAdapter(getContext(), + R.layout.app_preference_item, getEntries(), mEntryDrawables, selectedIndex); builder.setAdapter(adapter, this); super.onPrepareDialogBuilder(builder); } -} \ No newline at end of file +} diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 59074e58330..733d7711f0a 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -26,9 +26,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; -import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; -import android.graphics.drawable.Drawable; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.nfc.NfcAdapter; @@ -85,7 +83,7 @@ public class WirelessSettings extends RestrictedSettingsFragment private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1; private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage"; - private SmsListPreference mSmsApplicationPreference; + private AppListPreference mSmsApplicationPreference; public WirelessSettings() { super(null); @@ -174,23 +172,6 @@ public class WirelessSettings extends RestrictedSettingsFragment } } - private void updateSmsApplicationSetting() { - log("updateSmsApplicationSetting:"); - ComponentName appName = SmsApplication.getDefaultSmsApplication(getActivity(), true); - if (appName != null) { - String packageName = appName.getPackageName(); - - CharSequence[] values = mSmsApplicationPreference.getEntryValues(); - for (int i = 0; i < values.length; i++) { - if (packageName.contentEquals(values[i])) { - mSmsApplicationPreference.setValueIndex(i); - mSmsApplicationPreference.setSummary(mSmsApplicationPreference.getEntries()[i]); - break; - } - } - } - } - private void initSmsApplicationSetting() { log("initSmsApplicationSetting:"); Collection smsApplications = @@ -198,25 +179,18 @@ public class WirelessSettings extends RestrictedSettingsFragment // If the list is empty the dialog will be empty, but we will not crash. int count = smsApplications.size(); - CharSequence[] entries = new CharSequence[count]; - CharSequence[] entryValues = new CharSequence[count]; - Drawable[] entryImages = new Drawable[count]; - + String[] packageNames = new String[count]; int i = 0; for (SmsApplicationData smsApplicationData : smsApplications) { - entries[i] = smsApplicationData.mApplicationName; - entryValues[i] = smsApplicationData.mPackageName; - try { - entryImages[i] = mPm.getApplicationIcon(smsApplicationData.mPackageName); - } catch (NameNotFoundException e) { - entryImages[i] = mPm.getDefaultActivityIcon(); - } + packageNames[i] = smsApplicationData.mPackageName; i++; } - mSmsApplicationPreference.setEntries(entries); - mSmsApplicationPreference.setEntryValues(entryValues); - mSmsApplicationPreference.setEntryDrawables(entryImages); - updateSmsApplicationSetting(); + String defaultPackageName = null; + ComponentName appName = SmsApplication.getDefaultSmsApplication(getActivity(), true); + if (appName != null) { + defaultPackageName = appName.getPackageName(); + } + mSmsApplicationPreference.setPackageNames(packageNames, defaultPackageName); } @Override @@ -284,7 +258,7 @@ public class WirelessSettings extends RestrictedSettingsFragment mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference); mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam); - mSmsApplicationPreference = (SmsListPreference) findPreference(KEY_SMS_APPLICATION); + mSmsApplicationPreference = (AppListPreference) findPreference(KEY_SMS_APPLICATION); mSmsApplicationPreference.setOnPreferenceChangeListener(this); initSmsApplicationSetting(); @@ -468,7 +442,6 @@ public class WirelessSettings extends RestrictedSettingsFragment public boolean onPreferenceChange(Preference preference, Object newValue) { if (preference == mSmsApplicationPreference && newValue != null) { SmsApplication.setDefaultApplication(newValue.toString(), getActivity()); - updateSmsApplicationSetting(); return true; } return false;