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

Commit 7289d418 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

5/N Rename QSFooterImpl to QSFooterView 

Remove QSFooterImplController.Factory

Bug: 168904199
Test: atest SystemUITests && manual
Change-Id: Ie2ef5c620835c7ebb104316c0004e888af1c34cf
parent a61f381c

packages/SystemUI/res/layout/qs_footer_impl.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
-->



<!-- Extends FrameLayout -->

<com.android.systemui.qs.QSFooterImpl

<com.android.systemui.qs.QSFooterView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/qs_footer"

    android:layout_width="match_parent"
@@ -130,4 +130,4 @@ 
            </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

        </com.android.keyguard.AlphaOptimizedLinearLayout>

    </LinearLayout>

</com.android.systemui.qs.QSFooterImpl>
 
</com.android.systemui.qs.QSFooterView>

packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java→packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java

+7 −4
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@ 
 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 * limitations under the License.

 */



package com.android.systemui.qs;
@@ -51,7 +51,7 @@ import com.android.systemui.statusbar.phone.MultiUserSwitch; 
import com.android.systemui.statusbar.phone.SettingsButton;



/** */

public class QSFooterImpl extends FrameLayout {

public class QSFooterView extends FrameLayout {

    private SettingsButton mSettingsButton;

    protected View mSettingsContainer;

    private PageIndicator mPageIndicator;
@@ -88,7 +88,7 @@ public class QSFooterImpl extends FrameLayout { 
        }

    };



    public QSFooterImpl(Context context, AttributeSet attrs) {

    public QSFooterView(Context context, AttributeSet attrs) {

        super(context, attrs);

    }
@@ -201,6 +201,7 @@ public class QSFooterImpl extends FrameLayout { 
        updateEverything(isTunerEnabled);

    }



    /** */

    public void setExpansion(float headerExpansionFraction) {

        mExpansionAmount = headerExpansionFraction;

        if (mSettingsCogAnimator != null) mSettingsCogAnimator.setPosition(headerExpansionFraction);
@@ -225,6 +226,7 @@ public class QSFooterImpl extends FrameLayout { 
        super.onDetachedFromWindow();

    }



    /** */

    public void setListening(boolean listening) {

        if (listening == mListening) {

            return;
@@ -287,6 +289,7 @@ public class QSFooterImpl extends FrameLayout { 
        return mExpanded && mMultiUserSwitch.isMultiUserEnabled();

    }



    /** */

    public void setQSPanel(final QSPanel qsPanel) {

        if (qsPanel != null) {

            mMultiUserSwitch.setQsPanel(qsPanel);

packages/SystemUI/src/com/android/systemui/qs/QSFooterImplController.java→packages/SystemUI/src/com/android/systemui/qs/QSFooterViewController.java

+3 −44
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ import com.android.systemui.util.ViewController; 
import javax.inject.Inject;



/**

 * Controller for {@link QSFooterImpl}.

 * Controller for {@link QSFooterView}.

 */

@QSScope

public class QSFooterImplController extends ViewController<QSFooterImpl> implements QSFooter {

public class QSFooterViewController extends ViewController<QSFooterView> implements QSFooter {



    private final UserManager mUserManager;

    private final UserInfoController mUserInfoController;
@@ -116,7 +116,7 @@ public class QSFooterImplController extends ViewController<QSFooterImpl> impleme 
    private boolean mExpanded;



    @Inject

    QSFooterImplController(QSFooterImpl view, UserManager userManager,

    QSFooterViewController(QSFooterView view, UserManager userManager,

            UserInfoController userInfoController, ActivityStarter activityStarter,

            DeviceProvisionedController deviceProvisionedController, UserTracker userTracker,

            QSPanelController qsPanelController, TunerService tunerService,
@@ -238,45 +238,4 @@ public class QSFooterImplController extends ViewController<QSFooterImpl> impleme 
    private boolean isTunerEnabled() {

        return mTunerService.isTunerEnabled(mUserTracker.getUserHandle());

    }



    /**

     * Factory for {@link QSFooterImplController}.

     *

     * TODO(b/168904199): Delete this once QSFooterImpl is no longer marked as injectable.

     */

    @QSScope

    public static class Factory {

        private final UserManager mUserManager;

        private final UserInfoController mUserInfoController;

        private final ActivityStarter mActivityStarter;

        private final DeviceProvisionedController mDeviceProvisionedController;

        private final UserTracker mUserTracker;

        private final QSPanelController mQsPanelController;

        private final TunerService mTunerService;

        private final MetricsLogger mMetricsLogger;



        @Inject

        Factory(UserManager userManager, UserInfoController userInfoController,

                ActivityStarter activityStarter,

                DeviceProvisionedController deviceProvisionedController, UserTracker userTracker,

                QSPanelController qsPanelController, TunerService tunerService,

                MetricsLogger metricsLogger) {

            mUserManager = userManager;

            mUserInfoController = userInfoController;

            mActivityStarter = activityStarter;

            mDeviceProvisionedController = deviceProvisionedController;

            mUserTracker = userTracker;

            mQsPanelController = qsPanelController;

            mTunerService = tunerService;

            mMetricsLogger = metricsLogger;

        }



        QSFooterImplController create(QSFooterImpl view) {

            QSFooterImplController controller = new QSFooterImplController(view, mUserManager,

                    mUserInfoController, mActivityStarter, mDeviceProvisionedController,

                    mUserTracker, mQsPanelController, mTunerService, mMetricsLogger);

            controller.init();

            return controller;

        }

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        mQSDetail = view.findViewById(R.id.qs_detail);

        mHeader = view.findViewById(R.id.header);

        mQSPanelController.setHeaderContainer(view.findViewById(R.id.header_text_container));

        mFooter = qsFragmentComponent.getQSFooterFactory().create(

                view.findViewById(R.id.qs_footer));

        mFooter = qsFragmentComponent.getQSFooter();



        mQSContainerImplController = qsFragmentComponent.getQSContainerImplController();

        mQSContainerImplController.init();

packages/SystemUI/src/com/android/systemui/qs/dagger/QSFragmentComponent.java

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.qs.dagger; 


import com.android.systemui.qs.QSAnimator;

import com.android.systemui.qs.QSContainerImplController;

import com.android.systemui.qs.QSFooterImplController;

import com.android.systemui.qs.QSFooter;

import com.android.systemui.qs.QSFragment;

import com.android.systemui.qs.QSPanelController;

import com.android.systemui.qs.QuickQSPanelController;
@@ -50,6 +50,6 @@ public interface QSFragmentComponent { 
    /** Construct a {@link QSContainerImplController}. */

    QSContainerImplController getQSContainerImplController();



    /** */

    QSFooterImplController.Factory getQSFooterFactory();

    /** Construct a {@link QSFooter} */

    QSFooter getQSFooter();

}