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

Commit 5800b860 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "b149942757-remove-view-injection" into sc-v2-dev am: 1fe4da51 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16095028

Change-Id: I96cf0da91efe6aee2dea3fe2913263a6d77f2103
parents 4bb4a133 1fe4da51

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/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(

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+3 −7
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import com.android.systemui.statusbar.notification.stack.StackStateAnimator; 
import com.android.systemui.statusbar.phone.KeyguardBypassController;

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

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

import com.android.systemui.util.InjectionInflationController;

import com.android.systemui.util.LifecycleFragment;

import com.android.systemui.util.Utils;
@@ -96,7 +95,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    private ImageView mQsDragHandler;



    private final RemoteInputQuickSettingsDisabler mRemoteInputQuickSettingsDisabler;

    private final InjectionInflationController mInjectionInflater;

    private final CommandQueue mCommandQueue;

    private final QSDetailDisplayer mQsDetailDisplayer;

    private final MediaHost mQsMediaHost;
@@ -146,7 +144,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 


    @Inject

    public QSFragment(RemoteInputQuickSettingsDisabler remoteInputQsDisabler,

            InjectionInflationController injectionInflater, QSTileHost qsTileHost,

            QSTileHost qsTileHost,

            StatusBarStateController statusBarStateController, CommandQueue commandQueue,

            QSDetailDisplayer qsDetailDisplayer, @Named(QS_PANEL) MediaHost qsMediaHost,

            @Named(QUICK_QS_PANEL) MediaHost qqsMediaHost,
@@ -154,7 +152,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
            QSFragmentComponent.Factory qsComponentFactory,

            FalsingManager falsingManager, DumpManager dumpManager) {

        mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler;

        mInjectionInflater = injectionInflater;

        mCommandQueue = commandQueue;

        mQsDetailDisplayer = qsDetailDisplayer;

        mQsMediaHost = qsMediaHost;
@@ -171,9 +168,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    @Override

    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,

            Bundle savedInstanceState) {

        inflater = mInjectionInflater.injectable(

                inflater.cloneInContext(new ContextThemeWrapper(getContext(),

                        R.style.Theme_SystemUI_QuickSettings)));

        inflater = inflater.cloneInContext(new ContextThemeWrapper(getContext(),

                R.style.Theme_SystemUI_QuickSettings));

        return inflater.inflate(R.layout.qs_panel, container, false);

    }