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

Commit b8901703 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes from topics "b143224715-broadcast-injection", "b143224715-status-bar-in-app" 

* changes:
  Make BroadcastReceivers Injectable.
  Register OverlayPlugins in StatusBar directly.
parents be66ddd9 aefb346f

packages/CarSystemUI/src/com/android/systemui/CarComponentBinder.java

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui;



import com.android.systemui.dagger.DefaultActivityBinder;

import com.android.systemui.dagger.DefaultBroadcastReceiverBinder;

import com.android.systemui.dagger.DefaultServiceBinder;



import dagger.Module;
@@ -26,6 +27,7 @@ import dagger.Module; 
 */

@Module(includes = {

        DefaultActivityBinder.class,

        DefaultBroadcastReceiverBinder.class,

        DefaultServiceBinder.class,

        CarSystemUIBinder.class})

public class CarComponentBinder {

packages/CarSystemUI/src/com/android/systemui/CarSystemUIBinder.java

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.power.PowerUI;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsModule;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.NavigationBarController;
@@ -275,6 +276,7 @@ public abstract class CarSystemUIBinder { 
            PowerManager powerManager,

            DozeScrimController dozeScrimController,

            CommandQueue commandQueue,

            PluginManager pluginManager,

            CarNavigationBarController carNavigationBarController) {

        return new CarStatusBar(

                context,
@@ -341,6 +343,7 @@ public abstract class CarSystemUIBinder { 
                powerManager,

                dozeScrimController,

                commandQueue,

                pluginManager,

                carNavigationBarController);

    }

}

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+5 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import com.android.systemui.navigationbar.car.CarNavigationBarView; 
import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.qs.QS;

import com.android.systemui.qs.car.CarQSFragment;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.FlingAnimationUtils;
@@ -299,6 +300,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            PowerManager powerManager,

            DozeScrimController dozeScrimController,

            CommandQueue commandQueue,

            PluginManager pluginManager,



            /* Car Settings injected components. */

            CarNavigationBarController carNavigationBarController) {

        super(
@@ -366,7 +369,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                dozeServiceHost,

                powerManager,

                dozeScrimController,

                commandQueue);

                commandQueue,

                pluginManager);

        mScrimController = scrimController;

        mCarNavigationBarController = carNavigationBarController;

    }

packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java

+20 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui; 
import android.app.Activity;

import android.app.Application;

import android.app.Service;

import android.content.BroadcastReceiver;

import android.content.ContentProvider;

import android.content.Context;

import android.content.Intent;
@@ -125,6 +126,25 @@ public class SystemUIAppComponentFactory extends AppComponentFactory { 
        return super.instantiateServiceCompat(cl, className, intent);

    }



    @NonNull

    @Override

    public BroadcastReceiver instantiateReceiverCompat(@NonNull ClassLoader cl,

            @NonNull String className, @Nullable Intent intent)

            throws InstantiationException, IllegalAccessException, ClassNotFoundException {

        if (mComponentHelper == null) {

            // This shouldn't happen, but does when a device is freshly formatted.

            // Bug filed against framework to take a look: http://b/141008541

            SystemUIFactory.getInstance().getRootComponent().inject(

                    SystemUIAppComponentFactory.this);

        }

        BroadcastReceiver receiver = mComponentHelper.resolveBroadcastReceiver(className);

        if (receiver != null) {

            return receiver;

        }



        return super.instantiateReceiverCompat(cl, className, intent);

    }



    /**

     * A callback that receives a Context when one is ready.

     */

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+0 −68
Original line number Diff line number Diff line
@@ -24,23 +24,14 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.os.Handler;

import android.os.Looper;

import android.os.Process;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.UserHandle;

import android.util.ArraySet;

import android.util.Log;

import android.util.TimingsTraceLog;



import com.android.systemui.dagger.ContextComponentHelper;

import com.android.systemui.plugins.OverlayPlugin;

import com.android.systemui.plugins.PluginListener;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarWindowController;

import com.android.systemui.util.NotificationChannels;



import java.lang.reflect.Constructor;
@@ -224,65 +215,6 @@ public class SystemUIApplication extends Application implements SysUiServiceProv 
        }

        Dependency.get(InitController.class).executePostInitTasks();

        log.traceEnd();

        final Handler mainHandler = new Handler(Looper.getMainLooper());

        Dependency.get(PluginManager.class).addPluginListener(

                new PluginListener<OverlayPlugin>() {

                    private ArraySet<OverlayPlugin> mOverlays = new ArraySet<>();



                    @Override

                    public void onPluginConnected(OverlayPlugin plugin, Context pluginContext) {

                        mainHandler.post(new Runnable() {

                            @Override

                            public void run() {

                                StatusBar statusBar = getComponent(StatusBar.class);

                                if (statusBar != null) {

                                    plugin.setup(statusBar.getStatusBarWindow(),

                                            statusBar.getNavigationBarView(), new Callback(plugin),

                                            Dependency.get(DozeParameters.class));

                                }

                            }

                        });

                    }



                    @Override

                    public void onPluginDisconnected(OverlayPlugin plugin) {

                        mainHandler.post(new Runnable() {

                            @Override

                            public void run() {

                                mOverlays.remove(plugin);

                                Dependency.get(StatusBarWindowController.class).setForcePluginOpen(

                                        mOverlays.size() != 0);

                            }

                        });

                    }



                    class Callback implements OverlayPlugin.Callback {

                        private final OverlayPlugin mPlugin;



                        Callback(OverlayPlugin plugin) {

                            mPlugin = plugin;

                        }



                        @Override

                        public void onHoldStatusBarOpenChange() {

                            if (mPlugin.holdStatusBarOpen()) {

                                mOverlays.add(mPlugin);

                            } else {

                                mOverlays.remove(mPlugin);

                            }

                            mainHandler.post(new Runnable() {

                                @Override

                                public void run() {

                                    Dependency.get(StatusBarWindowController.class)

                                            .setStateListener(b -> mOverlays.forEach(

                                                    o -> o.setCollapseDesired(b)));

                                    Dependency.get(StatusBarWindowController.class)

                                            .setForcePluginOpen(mOverlays.size() != 0);

                                }

                            });

                        }

                    }

                }, OverlayPlugin.class, true /* Allow multiple plugins */);



        mServicesStarted = true;

    }