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

Commit eaf6b3b1 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Tuner plugin settings updates" into oc-dev

parents be41b612 d2e75262

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
        android:sharedUserId="android.uid.systemui"

        coreApp="true">



    <protected-broadcast android:name="com.android.systemui.action.PLUGIN_CHANGED" />





    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

packages/SystemUI/src/com/android/systemui/plugins/PluginInstanceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class PluginInstanceManager<T extends Plugin> { 
    private static final boolean DEBUG = false;



    private static final String TAG = "PluginInstanceManager";

    private static final String PLUGIN_PERMISSION = "com.android.systemui.permission.PLUGIN";

    public static final String PLUGIN_PERMISSION = "com.android.systemui.permission.PLUGIN";



    private final Context mContext;

    private final PluginListener<T> mListener;

packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java

+79 −28
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.net.Uri;
@@ -26,15 +27,18 @@ import android.os.Bundle; 
import android.provider.Settings;

import android.support.v14.preference.PreferenceFragment;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.PreferenceCategory;

import android.support.v7.preference.PreferenceScreen;

import android.support.v7.preference.PreferenceViewHolder;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.view.View;



import com.android.systemui.R;

import com.android.systemui.plugins.PluginInstanceManager;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.plugins.PluginPrefs;



import java.util.ArrayList;

import java.util.List;

import java.util.Set;
@@ -51,7 +55,6 @@ public class PluginFragment extends PreferenceFragment { 
        IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);

        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);

        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);

        filter.addAction(PluginManager.PLUGIN_CHANGED);

        filter.addDataScheme("package");

        getContext().registerReceiver(mReceiver, filter);

        filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED);
@@ -74,24 +77,59 @@ public class PluginFragment extends PreferenceFragment { 
        screen.setOrderingAsAdded(false);

        Context prefContext = getPreferenceManager().getContext();

        mPluginPrefs = new PluginPrefs(getContext());

        PackageManager pm = getContext().getPackageManager();



        Set<String> pluginActions = mPluginPrefs.getPluginList();

        ArrayMap<String, ArraySet<String>> plugins = new ArrayMap<>();

        for (String action : pluginActions) {

            String name = action.replace("com.android.systemui.action.PLUGIN_", "");

            PreferenceCategory category = new PreferenceCategory(prefContext);

            category.setTitle(name);



            List<ResolveInfo> result = getContext().getPackageManager().queryIntentServices(

            String name = toName(action);

            List<ResolveInfo> result = pm.queryIntentServices(

                    new Intent(action), PackageManager.MATCH_DISABLED_COMPONENTS);

            if (result.size() > 0) {

                screen.addPreference(category);

            }

            for (ResolveInfo info : result) {

                category.addPreference(new PluginPreference(prefContext, info));

                String packageName = info.serviceInfo.packageName;

                if (!plugins.containsKey(packageName)) {

                    plugins.put(packageName, new ArraySet<>());

                }

                plugins.get(packageName).add(name);

            }

        }



        List<PackageInfo> apps = pm.getPackagesHoldingPermissions(new String[]{

                PluginInstanceManager.PLUGIN_PERMISSION},

                PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.GET_SERVICES);

        apps.forEach(app -> {

            if (!plugins.containsKey(app.packageName)) return;

            SwitchPreference pref = new PluginPreference(prefContext, app);

            pref.setSummary("Plugins: " + toString(plugins.get(app.packageName)));

            screen.addPreference(pref);

        });

        setPreferenceScreen(screen);

    }



    private String toString(ArraySet<String> plugins) {

        StringBuilder b = new StringBuilder();

        for (String string : plugins) {

            if (b.length() != 0) {

                b.append(", ");

            }

            b.append(string);

        }

        return b.toString();

    }



    private String toName(String action) {

        String str = action.replace("com.android.systemui.action.PLUGIN_", "");

        StringBuilder b = new StringBuilder();

        for (String s : str.split("_")) {

            if (b.length() != 0) {

                b.append(' ');

            }

            b.append(s.substring(0, 1));

            b.append(s.substring(1).toLowerCase());

        }

        return b.toString();

    }



    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {
@@ -100,31 +138,44 @@ public class PluginFragment extends PreferenceFragment { 
    };



    private static class PluginPreference extends SwitchPreference {

        private final ComponentName mComponent;

        private final boolean mHasSettings;

        private final PackageInfo mInfo;

        private final PackageManager mPm;



        public PluginPreference(Context prefContext, ResolveInfo info) {

        public PluginPreference(Context prefContext, PackageInfo info) {

            super(prefContext);

            mComponent = new ComponentName(info.serviceInfo.packageName, info.serviceInfo.name);

            PackageManager pm = prefContext.getPackageManager();

            mHasSettings = pm.resolveActivity(new Intent(ACTION_PLUGIN_SETTINGS)

                    .setPackage(mComponent.getPackageName()), 0) != null;

            setTitle(info.serviceInfo.loadLabel(pm));

            setChecked(pm.getComponentEnabledSetting(mComponent)

                    != PackageManager.COMPONENT_ENABLED_STATE_DISABLED);

            mPm = prefContext.getPackageManager();

            mHasSettings = mPm.resolveActivity(new Intent(ACTION_PLUGIN_SETTINGS)

                    .setPackage(info.packageName), 0) != null;

            mInfo = info;

            setTitle(info.applicationInfo.loadLabel(mPm));

            setChecked(isPluginEnabled());

            setWidgetLayoutResource(R.layout.tuner_widget_settings_switch);

        }



        private boolean isPluginEnabled() {

            for (int i = 0; i < mInfo.services.length; i++) {

                ComponentName componentName = new ComponentName(mInfo.packageName,

                        mInfo.services[i].name);

                if (mPm.getComponentEnabledSetting(componentName)

                        == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {

                    return false;

                }

            }

            return true;

        }



        @Override

        protected boolean persistBoolean(boolean value) {

            PackageManager pm = getContext().getPackageManager();

            final int desiredState = value ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                    : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;

            if (pm.getComponentEnabledSetting(mComponent) == desiredState) return true;

            pm.setComponentEnabledSetting(mComponent,

                    desiredState,

            for (int i = 0; i < mInfo.services.length; i++) {

                ComponentName componentName = new ComponentName(mInfo.packageName,

                        mInfo.services[i].name);

                mPm.setComponentEnabledSetting(componentName, desiredState,

                        PackageManager.DONT_KILL_APP);

            final String pkg = mComponent.getPackageName();

            }

            final String pkg = mInfo.packageName;

            final Intent intent = new Intent(PluginManager.PLUGIN_CHANGED,

                    pkg != null ? Uri.fromParts("package", pkg, null) : null);

            getContext().sendBroadcast(intent);
@@ -141,7 +192,7 @@ public class PluginFragment extends PreferenceFragment { 
            holder.findViewById(R.id.settings).setOnClickListener(v -> {

                ResolveInfo result = v.getContext().getPackageManager().resolveActivity(

                        new Intent(ACTION_PLUGIN_SETTINGS).setPackage(

                                mComponent.getPackageName()), 0);

                                mInfo.packageName), 0);

                if (result != null) {

                    v.getContext().startActivity(new Intent().setComponent(

                            new ComponentName(result.activityInfo.packageName,
@@ -150,7 +201,7 @@ public class PluginFragment extends PreferenceFragment { 
            });

            holder.itemView.setOnLongClickListener(v -> {

                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);

                intent.setData(Uri.fromParts("package", mComponent.getPackageName(), null));

                intent.setData(Uri.fromParts("package", mInfo.packageName, null));

                getContext().startActivity(intent);

                return true;

            });

packages/SystemUI/tests/src/com/android/systemui/plugins/PluginInstanceManagerTest.java

+5 −0
Original line number Diff line number Diff line
@@ -273,6 +273,11 @@ public class PluginInstanceManagerTest extends SysuiTestCase { 
        @Override

        public void unregisterReceiver(BroadcastReceiver receiver) {

        }



        @Override

        public void sendBroadcast(Intent intent) {

            // Do nothing.

        }

    }



    // This target class doesn't matter, it just needs to have a Requires to hit the flow where