Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee1d08fd authored by Danny Baumann's avatar Danny Baumann
Browse files

Deduplicate adapter-of-installed-packages code. 

Change-Id: I454ba79eddaaff86233a2cc341f4c8bebe94729e
parent 0fb393d8

src/com/android/settings/cyanogenmod/PackageListAdapter.java

0 → 100644
+179 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012-2014 The CyanogenMod Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.cyanogenmod;



import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.graphics.drawable.Drawable;

import android.os.Handler;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.BaseAdapter;

import android.widget.ImageView;

import android.widget.TextView;



import com.android.settings.R;



import java.util.Collections;

import java.util.LinkedList;

import java.util.List;

import java.util.TreeSet;



public class PackageListAdapter extends BaseAdapter implements Runnable {

    private PackageManager mPm;

    private LayoutInflater mInflater;

    private List<PackageItem> mInstalledPackages = new LinkedList<PackageItem>();

    private final Handler mHandler = new Handler();



    public static class PackageItem implements Comparable<PackageItem> {

        public final String packageName;

        public final CharSequence title;

        public final TreeSet<CharSequence> activityTitles = new TreeSet<CharSequence>();

        public final Drawable icon;

        public final boolean enabled;



        PackageItem(String packageName, CharSequence title,

                CharSequence activityTitle, Drawable icon, boolean enabled) {

            this.packageName = packageName;

            this.title = title;

            this.activityTitles.add(activityTitle);

            this.icon = icon;

            this.enabled = enabled;

        }



        @Override

        public int compareTo(PackageItem another) {

            if (enabled != another.enabled) {

                return enabled ? -1 : 1;

            }

            int result = title.toString().compareToIgnoreCase(another.title.toString());

            return result != 0 ? result : packageName.compareTo(another.packageName);

        }

    }



    public PackageListAdapter(Context context) {

        mPm = context.getPackageManager();

        mInflater = LayoutInflater.from(context);

        reloadList();

    }



    @Override

    public int getCount() {

        synchronized (mInstalledPackages) {

            return mInstalledPackages.size();

        }

    }



    @Override

    public PackageItem getItem(int position) {

        synchronized (mInstalledPackages) {

            return mInstalledPackages.get(position);

        }

    }



    @Override

    public long getItemId(int position) {

        synchronized (mInstalledPackages) {

            // packageName is guaranteed to be unique in mInstalledPackages

            return mInstalledPackages.get(position).packageName.hashCode();

        }

    }



    @Override

    public View getView(int position, View convertView, ViewGroup parent) {

        ViewHolder holder;

        if (convertView != null) {

            holder = (ViewHolder) convertView.getTag();

        } else {

            convertView = mInflater.inflate(R.layout.preference_icon, null, false);

            holder = new ViewHolder();

            convertView.setTag(holder);

            holder.title = (TextView) convertView.findViewById(com.android.internal.R.id.title);

            holder.summary = (TextView) convertView.findViewById(com.android.internal.R.id.summary);

            holder.icon = (ImageView) convertView.findViewById(R.id.icon);

        }



        PackageItem applicationInfo = getItem(position);

        holder.title.setText(applicationInfo.title);

        holder.icon.setImageDrawable(applicationInfo.icon);



        boolean needSummary = applicationInfo.activityTitles.size() > 0;

        if (applicationInfo.activityTitles.size() == 1) {

            if (TextUtils.equals(applicationInfo.title, applicationInfo.activityTitles.first())) {

                needSummary = false;

            }

        }



        if (needSummary) {

            holder.summary.setText(TextUtils.join(", ", applicationInfo.activityTitles));

            holder.summary.setVisibility(View.VISIBLE);

        } else {

            holder.summary.setVisibility(View.GONE);

        }



        return convertView;

    }



    private void reloadList() {

        new Thread(this).start();

    }



    @Override

    public void run() {

        synchronized (mInstalledPackages) {

            mInstalledPackages.clear();

        }



        final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);

        mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);

        List<ResolveInfo> installedAppsInfo = mPm.queryIntentActivities(mainIntent, 0);



        for (ResolveInfo info : installedAppsInfo) {

            ApplicationInfo appInfo = info.activityInfo.applicationInfo;

            final PackageItem item = new PackageItem(appInfo.packageName,

                    appInfo.loadLabel(mPm), info.loadLabel(mPm),

                    appInfo.loadIcon(mPm), appInfo.enabled);



            mHandler.post(new Runnable() {

                @Override

                public void run() {

                    // NO synchronize here: We know that mInstalledApps.clear()

                    // was called and will never be called again.

                    // At this point the only thread modifying mInstalledApp is main

                    int index = Collections.binarySearch(mInstalledPackages, item);

                    if (index < 0) {

                        mInstalledPackages.add(-index - 1, item);

                    } else {

                        mInstalledPackages.get(index).activityTitles.addAll(item.activityTitles);

                    }

                    notifyDataSetChanged();

                }

            });

        }

    }



    private static class ViewHolder {

        TextView title;

        TextView summary;

        ImageView icon;

    }

}

src/com/android/settings/headsup/HeadsUpSettings.java

+6 −157
Original line number Diff line number Diff line
@@ -22,40 +22,29 @@ import android.app.AlertDialog; 
import android.app.Dialog;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.Handler;

import android.preference.Preference;

import android.preference.PreferenceActivity;

import android.preference.PreferenceGroup;

import android.provider.Settings;

import android.text.TextUtils;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.AdapterView;

import android.widget.BaseAdapter;

import android.widget.ImageView;

import android.widget.ListView;

import android.widget.Switch;

import android.widget.TextView;



import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.cyanogenmod.PackageListAdapter;

import com.android.settings.cyanogenmod.PackageListAdapter.PackageItem;



import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.List;

import java.util.Map;

import java.util.TreeSet;



public class HeadsUpSettings extends SettingsPreferenceFragment

        implements AdapterView.OnItemLongClickListener, Preference.OnPreferenceClickListener {
@@ -63,7 +52,7 @@ public class HeadsUpSettings extends SettingsPreferenceFragment 
    private static final int DIALOG_DND_APPS = 0;

    private static final int DIALOG_BLACKLIST_APPS = 1;



    private PackageAdapter mPackageAdapter;

    private PackageListAdapter mPackageAdapter;

    private PackageManager mPackageManager;

    private PreferenceGroup mDndPrefList;

    private PreferenceGroup mBlacklistPrefList;
@@ -84,7 +73,7 @@ public class HeadsUpSettings extends SettingsPreferenceFragment 
        // Get launch-able applications

        addPreferencesFromResource(R.xml.heads_up_settings);

        mPackageManager = getPackageManager();

        mPackageAdapter = new PackageAdapter();

        mPackageAdapter = new PackageListAdapter(getActivity());



        mDndPrefList = (PreferenceGroup) findPreference("dnd_applications_list");

        mDndPrefList.setOrderingAsAdded(false);
@@ -227,146 +216,6 @@ public class HeadsUpSettings extends SettingsPreferenceFragment 


    };



    /**

     * AppItem class

     */

    private static class PackageItem implements Comparable<PackageItem> {

        CharSequence title;

        TreeSet<CharSequence> activityTitles = new TreeSet<CharSequence>();

        String packageName;

        Drawable icon;



        @Override

        public int compareTo(PackageItem another) {

            int result = title.toString().compareToIgnoreCase(another.title.toString());

            return result != 0 ? result : packageName.compareTo(another.packageName);

        }

    }



    /**

     * AppAdapter class

     */

    private class PackageAdapter extends BaseAdapter {

        private List<PackageItem> mInstalledPackages = new LinkedList<PackageItem>();



        private void reloadList() {

            final Handler handler = new Handler();

            new Thread(new Runnable() {

                @Override

                public void run() {

                    synchronized (mInstalledPackages) {

                        mInstalledPackages.clear();

                    }



                    final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);

                    mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);

                    List<ResolveInfo> installedAppsInfo =

                            mPackageManager.queryIntentActivities(mainIntent, 0);



                    for (ResolveInfo info : installedAppsInfo) {

                        ApplicationInfo appInfo = info.activityInfo.applicationInfo;



                        final PackageItem item = new PackageItem();

                        item.title = appInfo.loadLabel(mPackageManager);

                        item.activityTitles.add(info.loadLabel(mPackageManager));

                        item.icon = appInfo.loadIcon(mPackageManager);

                        item.packageName = appInfo.packageName;



                        handler.post(new Runnable() {

                            @Override

                            public void run() {

                                // NO synchronize here: We know that mInstalledApps.clear()

                                // was called and will never be called again.

                                // At this point the only thread modifying mInstalledApp is main

                                int index = Collections.binarySearch(mInstalledPackages, item);

                                if (index < 0) {

                                    mInstalledPackages.add(-index - 1, item);

                                } else {

                                    mInstalledPackages.get(index)

                                            .activityTitles.addAll(item.activityTitles);

                                }

                                notifyDataSetChanged();

                            }

                        });

                    }

                }

            }).start();

        }



        public PackageAdapter() {

            reloadList();

        }



        @Override

        public int getCount() {

            synchronized (mInstalledPackages) {

                return mInstalledPackages.size();

            }

        }



        @Override

        public PackageItem getItem(int position) {

            synchronized (mInstalledPackages) {

                return mInstalledPackages.get(position);

            }

        }



        @Override

        public long getItemId(int position) {

            synchronized (mInstalledPackages) {

                // packageName is guaranteed to be unique in mInstalledPackages

                return mInstalledPackages.get(position).packageName.hashCode();

            }

        }



        @Override

        public View getView(int position, View convertView, ViewGroup parent) {

            ViewHolder holder;

            if (convertView != null) {

                holder = (ViewHolder) convertView.getTag();

            } else {

                final LayoutInflater layoutInflater =

                        (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);

                convertView = layoutInflater.inflate(R.layout.preference_icon, null, false);

                holder = new ViewHolder();

                convertView.setTag(holder);

                holder.title = (TextView)

                        convertView.findViewById(com.android.internal.R.id.title);

                holder.summary = (TextView)

                        convertView.findViewById(com.android.internal.R.id.summary);

                holder.icon = (ImageView)

                        convertView.findViewById(R.id.icon);

            }

            PackageItem applicationInfo = getItem(position);



            holder.title.setText(applicationInfo.title);

            holder.icon.setImageDrawable(applicationInfo.icon);



            boolean needSummary = applicationInfo.activityTitles.size() > 0;

            if (applicationInfo.activityTitles.size() == 1) {

                if (TextUtils.equals(applicationInfo.title,

                        applicationInfo.activityTitles.first())) {

                    needSummary = false;

                }

            }



            if (needSummary) {

                holder.summary.setText(TextUtils.join(", ", applicationInfo.activityTitles));

                holder.summary.setVisibility(View.VISIBLE);

            } else {

                holder.summary.setVisibility(View.GONE);

            }



            return convertView;

        }

    }



    static class ViewHolder {

        TextView title;

        TextView summary;

        ImageView icon;

    }



    private void refreshCustomApplicationPrefs() {

        if (!parsePackageList()) {

            return;

src/com/android/settings/notificationlight/NotificationLightSettings.java

+4 −148
Original line number Diff line number Diff line
@@ -21,16 +21,12 @@ import android.app.Dialog; 
import android.content.ContentResolver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.Handler;

import android.preference.CheckBoxPreference;

import android.preference.Preference;

import android.preference.PreferenceGroup;
@@ -39,29 +35,23 @@ import android.provider.Settings; 
import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;

import android.view.View;

import android.view.ViewGroup;

import android.widget.AdapterView;

import android.widget.AdapterView.OnItemClickListener;

import android.widget.BaseAdapter;

import android.widget.ImageView;

import android.widget.ListView;

import android.widget.TextView;



import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.cyanogenmod.PackageListAdapter;

import com.android.settings.cyanogenmod.PackageListAdapter.PackageItem;



import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.List;

import java.util.Map;

import java.util.TreeSet;



public class NotificationLightSettings extends SettingsPreferenceFragment implements

        Preference.OnPreferenceChangeListener, AdapterView.OnItemLongClickListener {
@@ -97,7 +87,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem 
    private ApplicationLightPreference mCallPref;

    private ApplicationLightPreference mVoicemailPref;

    private Menu mMenu;

    private PackageAdapter mPackageAdapter;

    private PackageListAdapter mPackageAdapter;

    private String mPackageList;

    private Map<String, Package> mPackages;
@@ -141,7 +131,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem 


        // Get launch-able applications

        mPackageManager = getPackageManager();

        mPackageAdapter = new PackageAdapter();

        mPackageAdapter = new PackageListAdapter(getActivity());



        mPackages = new HashMap<String, Package>();
@@ -502,138 +492,4 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem 
        }



    };



    /**

     * AppItem class

     */

    private static class PackageItem implements Comparable<PackageItem> {

        CharSequence title;

        TreeSet<CharSequence> activityTitles = new TreeSet<CharSequence>();

        String packageName;

        Drawable icon;



        @Override

        public int compareTo(PackageItem another) {

            int result = title.toString().compareToIgnoreCase(another.title.toString());

            return result != 0 ? result : packageName.compareTo(another.packageName);

        }

    }



    /**

     * AppAdapter class

     */

    private class PackageAdapter extends BaseAdapter {

        private List<PackageItem> mInstalledPackages = new LinkedList<PackageItem>();



        private void reloadList() {

            final Handler handler = new Handler();

            new Thread(new Runnable() {

                @Override

                public void run() {

                    synchronized (mInstalledPackages) {

                        mInstalledPackages.clear();

                    }



                    final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);

                    mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);

                    List<ResolveInfo> installedAppsInfo =

                            mPackageManager.queryIntentActivities(mainIntent, 0);



                    for (ResolveInfo info : installedAppsInfo) {

                        ApplicationInfo appInfo = info.activityInfo.applicationInfo;



                        final PackageItem item = new PackageItem();

                        item.title = appInfo.loadLabel(mPackageManager);

                        item.activityTitles.add(info.loadLabel(mPackageManager));

                        item.icon = appInfo.loadIcon(mPackageManager);

                        item.packageName = appInfo.packageName;



                        handler.post(new Runnable() {

                            @Override

                            public void run() {

                                // NO synchronize here: We know that mInstalledApps.clear()

                                // was called and will never be called again.

                                // At this point the only thread modifying mInstalledApp is main

                                int index = Collections.binarySearch(mInstalledPackages, item);

                                if (index < 0) {

                                    mInstalledPackages.add(-index - 1, item);

                                } else {

                                    mInstalledPackages.get(index).activityTitles.addAll(item.activityTitles);

                                }

                                notifyDataSetChanged();

                            }

                        });

                    }

                }

            }).start();

        }



        public PackageAdapter() {

            reloadList();

        }



        @Override

        public int getCount() {

            synchronized (mInstalledPackages) {

                return mInstalledPackages.size();

            }

        }



        @Override

        public PackageItem getItem(int position) {

            synchronized (mInstalledPackages) {

                return mInstalledPackages.get(position);

            }

        }



        @Override

        public long getItemId(int position) {

            synchronized (mInstalledPackages) {

                // packageName is guaranteed to be unique in mInstalledPackages

                return mInstalledPackages.get(position).packageName.hashCode();

            }

        }



        @Override

        public View getView(int position, View convertView, ViewGroup parent) {

            ViewHolder holder;

            if (convertView != null) {

                holder = (ViewHolder) convertView.getTag();

            } else {

                final LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);

                convertView = layoutInflater.inflate(R.layout.preference_icon, null, false);

                holder = new ViewHolder();

                convertView.setTag(holder);

                holder.title = (TextView) convertView.findViewById(com.android.internal.R.id.title);

                holder.summary = (TextView) convertView.findViewById(com.android.internal.R.id.summary);

                holder.icon = (ImageView) convertView.findViewById(R.id.icon);

            }

            PackageItem applicationInfo = getItem(position);



            holder.title.setText(applicationInfo.title);

            holder.icon.setImageDrawable(applicationInfo.icon);



            boolean needSummary = applicationInfo.activityTitles.size() > 0;

            if (applicationInfo.activityTitles.size() == 1) {

                if (TextUtils.equals(applicationInfo.title, applicationInfo.activityTitles.first())) {

                    needSummary = false;

                }

            }



            if (needSummary) {

                holder.summary.setText(TextUtils.join(", ", applicationInfo.activityTitles));

                holder.summary.setVisibility(View.VISIBLE);

            } else {

                holder.summary.setVisibility(View.GONE);

            }



            return convertView;

        }

    }



    static class ViewHolder {

        TextView title;

        TextView summary;

        ImageView icon;

    }

}

src/com/android/settings/profiles/AppGroupConfig.java

+4 −131

File changed.

Preview size limit exceeded, changes collapsed.