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

Commit 1fe4da51 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b149942757-remove-view-injection" into sc-v2-dev 

* changes:
  Remove View Injection entirely.
  Remove injected parametser from NSSL
parents 430944ce 8fe314ad

packages/SystemUI/proguard.flags

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
-keep class com.android.systemui.fragments.FragmentService$FragmentCreator {

    *;

}

-keep class com.android.systemui.util.InjectionInflationController$ViewInstanceCreator {

    *;

}

-keep class androidx.core.app.CoreComponentFactory



-keep public class * extends com.android.systemui.SystemUI {

packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java

+3 −5
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.systemui.plugins.ClockPlugin; 
import com.android.systemui.plugins.PluginListener;

import com.android.systemui.settings.CurrentUserObservable;

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

import com.android.systemui.util.InjectionInflationController;



import java.util.ArrayList;

import java.util.Collection;
@@ -125,16 +124,16 @@ public final class ClockManager { 
    private final int mHeight;



    @Inject

    public ClockManager(Context context, InjectionInflationController injectionInflater,

    public ClockManager(Context context, LayoutInflater layoutInflater,

            PluginManager pluginManager, SysuiColorExtractor colorExtractor,

            @Nullable DockManager dockManager, BroadcastDispatcher broadcastDispatcher) {

        this(context, injectionInflater, pluginManager, colorExtractor,

        this(context, layoutInflater, pluginManager, colorExtractor,

                context.getContentResolver(), new CurrentUserObservable(broadcastDispatcher),

                new SettingsWrapper(context.getContentResolver()), dockManager);

    }



    @VisibleForTesting

    ClockManager(Context context, InjectionInflationController injectionInflater,

    ClockManager(Context context, LayoutInflater layoutInflater,

            PluginManager pluginManager, SysuiColorExtractor colorExtractor,

            ContentResolver contentResolver, CurrentUserObservable currentUserObservable,

            SettingsWrapper settingsWrapper, DockManager dockManager) {
@@ -147,7 +146,6 @@ public final class ClockManager { 
        mPreviewClocks = new AvailableClocks();



        Resources res = context.getResources();

        LayoutInflater layoutInflater = injectionInflater.injectable(LayoutInflater.from(context));



        addBuiltinClock(() -> new DefaultClockController(res, layoutInflater, colorExtractor));

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

+16 −0
Original line number Diff line number Diff line
@@ -89,8 +89,12 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager.Keyg 
import com.android.systemui.statusbar.notification.NotificationFilter;

import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy;

import com.android.systemui.statusbar.notification.collection.legacy.VisualStabilityManager;

import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.stack.AmbientState;

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager;

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

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

import com.android.systemui.statusbar.phone.KeyguardDismissUtil;
@@ -102,6 +106,7 @@ import com.android.systemui.statusbar.phone.ShadeController; 
import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider;

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

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

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

import com.android.systemui.statusbar.policy.AccessibilityController;

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;

import com.android.systemui.statusbar.policy.BatteryController;
@@ -360,6 +365,11 @@ public class Dependency { 
    @Inject Lazy<FeatureFlags> mFeatureFlagsLazy;

    @Inject Lazy<StatusBarContentInsetsProvider> mContentInsetsProviderLazy;

    @Inject Lazy<InternetDialogFactory> mInternetDialogFactory;

    @Inject Lazy<NotificationSectionsManager> mNotificationSectionsManagerLazy;

    @Inject Lazy<UnlockedScreenOffAnimationController> mUnlockedScreenOffAnimationControllerLazy;

    @Inject Lazy<AmbientState> mAmbientStateLazy;

    @Inject Lazy<GroupMembershipManager> mGroupMembershipManagerLazy;

    @Inject Lazy<GroupExpansionManager> mGroupExpansionManagerLazy;



    @Inject

    public Dependency() {
@@ -574,6 +584,12 @@ public class Dependency { 
        mProviders.put(UiEventLogger.class, mUiEventLogger::get);

        mProviders.put(FeatureFlags.class, mFeatureFlagsLazy::get);

        mProviders.put(StatusBarContentInsetsProvider.class, mContentInsetsProviderLazy::get);

        mProviders.put(NotificationSectionsManager.class, mNotificationSectionsManagerLazy::get);

        mProviders.put(UnlockedScreenOffAnimationController.class,

                mUnlockedScreenOffAnimationControllerLazy::get);

        mProviders.put(AmbientState.class, mAmbientStateLazy::get);

        mProviders.put(GroupMembershipManager.class, mGroupMembershipManagerLazy::get);

        mProviders.put(GroupExpansionManager.class, mGroupExpansionManagerLazy::get);



        Dependency.setInstance(this);

    }

packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java

+0 −6
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.keyguard.KeyguardSliceProvider;

import com.android.systemui.people.PeopleProvider;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.util.InjectionInflationController;

import com.android.wm.shell.ShellCommandHandler;

import com.android.wm.shell.TaskViewFactory;

import com.android.wm.shell.apppairs.AppPairs;
@@ -146,11 +145,6 @@ public interface SysUIComponent { 
    @SysUISingleton

    InitController getInitController();



    /**

     * ViewInstanceCreator generates all Views that need injection.

     */

    InjectionInflationController.ViewInstanceCreator.Factory createViewInstanceCreatorFactory();



    /**

     * Member injection into the supplied argument.

     */

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+2 −5
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ import com.android.systemui.statusbar.policy.dagger.SmartRepliesInflationModule; 
import com.android.systemui.statusbar.policy.dagger.StatusBarPolicyModule;

import com.android.systemui.tuner.dagger.TunerModule;

import com.android.systemui.user.UserModule;

import com.android.systemui.util.InjectionInflationController;

import com.android.systemui.util.concurrency.SysUIConcurrencyModule;

import com.android.systemui.util.dagger.UtilModule;

import com.android.systemui.util.sensors.SensorModule;
@@ -216,11 +215,9 @@ public abstract class SystemUIModule { 


    @Provides

    @SysUISingleton

    static StatusBarWindowView providesStatusBarWindowView(Context context,

            InjectionInflationController injectionInflationController) {

    static StatusBarWindowView providesStatusBarWindowView(LayoutInflater layoutInflater) {

        StatusBarWindowView view =

                (StatusBarWindowView) injectionInflationController.injectable(

                        LayoutInflater.from(context)).inflate(R.layout.super_status_bar,

                (StatusBarWindowView) layoutInflater.inflate(R.layout.super_status_bar,

                        /* root= */ null);

        if (view == null) {

            throw new IllegalStateException(