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

Commit 8966d997 authored by Jason Monk's avatar Jason Monk
Browse files

Move QSFragment to be a LifecycleFragment

Test: existing tests
Change-Id: Ic8951a0171233c530111295f02f57dd7005fb19f
parent 09f4d371
Loading
Loading
Loading
Loading
+7 −10
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;

import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.app.Fragment;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Rect;
import android.os.Bundle;
@@ -46,10 +46,11 @@ import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
import com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer;
import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
import com.android.systemui.util.InjectionInflationController;
import com.android.systemui.util.LifecycleFragment;

import javax.inject.Inject;

public class QSFragment extends Fragment implements QS, CommandQueue.Callbacks {
public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Callbacks {
    private static final String TAG = "QS";
    private static final boolean DEBUG = false;
    private static final String EXTRA_EXPANDED = "expanded";
@@ -81,9 +82,12 @@ public class QSFragment extends Fragment implements QS, CommandQueue.Callbacks {

    @Inject
    public QSFragment(RemoteInputQuickSettingsDisabler remoteInputQsDisabler,
            InjectionInflationController injectionInflater) {
            InjectionInflationController injectionInflater,
            Context context) {
        mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler;
        mInjectionInflater = injectionInflater;
        SysUiServiceProvider.getComponent(context, CommandQueue.class)
                .observe(getLifecycle(), this);
    }

    @Override
@@ -118,13 +122,6 @@ public class QSFragment extends Fragment implements QS, CommandQueue.Callbacks {
                mQSPanel.getTileLayout().restoreInstanceState(savedInstanceState);
            }
        }
        SysUiServiceProvider.getComponent(getContext(), CommandQueue.class).addCallback(this);
    }

    @Override
    public void onDestroyView() {
        SysUiServiceProvider.getComponent(getContext(), CommandQueue.class).removeCallback(this);
        super.onDestroyView();
    }

    @Override
+2 −1
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ public class QSFragmentTest extends SysuiBaseFragmentTest {
    @Override
    protected Fragment instantiate(Context context, String className, Bundle arguments) {
        return new QSFragment(new RemoteInputQuickSettingsDisabler(context),
                new InjectionInflationController(SystemUIFactory.getInstance().getRootComponent()));
                new InjectionInflationController(SystemUIFactory.getInstance().getRootComponent()),
                context);
    }
}