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

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

Merge changes from topic "b168904199-qs-injection" 

* changes:
  5/N Rename QSFooterImpl to QSFooterView
  4/N Remove ActivityStarter from QSFooterImpl.
  3/N Remove DevProvCtrl & UserTracker from QSFooter
  2/N Move UserInfoController out of QSFooterImpl
  1/N Add Controller for QSFooter
parents fa47d246 7289d418

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/QSDetail.java

+3 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class QSDetail extends LinearLayout { 
    private int mOpenY;

    private boolean mAnimatingOpen;

    private boolean mSwitchState;

    private View mFooter;

    private QSFooter mFooter;



    public QSDetail(Context context, @Nullable AttributeSet attrs) {

        super(context, attrs);
@@ -120,7 +120,8 @@ public class QSDetail extends LinearLayout { 
        mDetailDoneButton.setOnClickListener(doneListener);

    }



    public void setQsPanel(QSPanel panel, QuickStatusBarHeader header, View footer) {

    /** */

    public void setQsPanel(QSPanel panel, QuickStatusBarHeader header, QSFooter footer) {

        mQsPanel = panel;

        mHeader = header;

        mFooter = footer;

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

+23 −148
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,19 +11,14 @@ 
 * 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;



import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;



import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;



import android.content.ClipData;

import android.content.ClipboardManager;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.database.ContentObserver;

import android.graphics.PorterDuff.Mode;
@@ -36,50 +31,27 @@ import android.os.Handler; 
import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.TextView;

import android.widget.Toast;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.settingslib.Utils;

import com.android.settingslib.development.DevelopmentSettingsEnabler;

import com.android.settingslib.drawable.UserIconDrawable;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.R.dimen;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.qs.TouchAnimator.Builder;

import com.android.systemui.settings.UserTracker;

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

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

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

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

import com.android.systemui.statusbar.policy.UserInfoController.OnUserInfoChangedListener;

import com.android.systemui.tuner.TunerService;



import javax.inject.Inject;

import javax.inject.Named;



public class QSFooterImpl extends FrameLayout implements QSFooter,

        OnClickListener, OnUserInfoChangedListener {



    private static final String TAG = "QSFooterImpl";



    private final ActivityStarter mActivityStarter;

    private final UserInfoController mUserInfoController;

    private final DeviceProvisionedController mDeviceProvisionedController;

    private final UserTracker mUserTracker;

/** */

public class QSFooterView extends FrameLayout {

    private SettingsButton mSettingsButton;

    protected View mSettingsContainer;

    private PageIndicator mPageIndicator;
@@ -87,7 +59,6 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
    private boolean mShouldShowBuildText;



    private boolean mQsDisabled;

    private QSPanel mQsPanel;

    private QuickQSPanel mQuickQsPanel;



    private boolean mExpanded;
@@ -117,39 +88,19 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        }

    };



    @Inject

    public QSFooterImpl(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs,

            ActivityStarter activityStarter, UserInfoController userInfoController,

            DeviceProvisionedController deviceProvisionedController, UserTracker userTracker) {

    public QSFooterView(Context context, AttributeSet attrs) {

        super(context, attrs);

        mActivityStarter = activityStarter;

        mUserInfoController = userInfoController;

        mDeviceProvisionedController = deviceProvisionedController;

        mUserTracker = userTracker;

    }



    @VisibleForTesting

    public QSFooterImpl(Context context, AttributeSet attrs) {

        this(context, attrs,

                Dependency.get(ActivityStarter.class),

                Dependency.get(UserInfoController.class),

                Dependency.get(DeviceProvisionedController.class),

                Dependency.get(UserTracker.class));

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mEdit = findViewById(android.R.id.edit);

        mEdit.setOnClickListener(view ->

                mActivityStarter.postQSRunnableDismissingKeyguard(() ->

                        mQsPanel.showEdit(view)));



        mPageIndicator = findViewById(R.id.footer_page_indicator);



        mSettingsButton = findViewById(R.id.settings_button);

        mSettingsContainer = findViewById(R.id.settings_button_container);

        mSettingsButton.setOnClickListener(this);



        mMultiUserSwitch = findViewById(R.id.multi_user_switch);

        mMultiUserAvatar = mMultiUserSwitch.findViewById(R.id.multi_user_avatar);
@@ -157,19 +108,6 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        mActionsContainer = findViewById(R.id.qs_footer_actions_container);

        mEditContainer = findViewById(R.id.qs_footer_actions_edit_container);

        mBuildText = findViewById(R.id.build);

        mBuildText.setOnLongClickListener(view -> {

            CharSequence buildText = mBuildText.getText();

            if (!TextUtils.isEmpty(buildText)) {

                ClipboardManager service =

                        mUserTracker.getUserContext().getSystemService(ClipboardManager.class);

                String label = mContext.getString(R.string.build_number_clip_data_label);

                service.setPrimaryClip(ClipData.newPlainText(label, buildText));

                Toast.makeText(mContext, R.string.build_number_copy_toast, Toast.LENGTH_SHORT)

                        .show();

                return true;

            }

            return false;

        });



        // RenderThread is doing more harm than good when touching the header (to expand quick

        // settings), so disable it for this view
@@ -180,7 +118,6 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight,

                oldBottom) -> updateAnimator(right - left));

        setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);

        updateEverything();

        setBuildText();

    }
@@ -249,24 +186,22 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
                .build();

    }



    @Override

    public void setKeyguardShowing(boolean keyguardShowing) {

    /** */

    public void setKeyguardShowing() {

        setExpansion(mExpansionAmount);

    }



    @Override

    public void setExpandClickListener(OnClickListener onClickListener) {

        mExpandClickListener = onClickListener;

    }



    @Override

    public void setExpanded(boolean expanded) {

    void setExpanded(boolean expanded, boolean isTunerEnabled) {

        if (mExpanded == expanded) return;

        mExpanded = expanded;

        updateEverything();

        updateEverything(isTunerEnabled);

    }



    @Override

    /** */

    public void setExpansion(float headerExpansionFraction) {

        mExpansionAmount = headerExpansionFraction;

        if (mSettingsCogAnimator != null) mSettingsCogAnimator.setPosition(headerExpansionFraction);
@@ -287,18 +222,16 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
    @Override

    @VisibleForTesting

    public void onDetachedFromWindow() {

        setListening(false);

        mContext.getContentResolver().unregisterContentObserver(mDeveloperSettingsObserver);

        super.onDetachedFromWindow();

    }



    @Override

    /** */

    public void setListening(boolean listening) {

        if (listening == mListening) {

            return;

        }

        mListening = listening;

        updateListeners();

    }



    @Override
@@ -318,17 +251,16 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_EXPAND);

    }



    @Override

    public void disable(int state1, int state2, boolean animate) {

    void disable(int state2, boolean isTunerEnabled) {

        final boolean disabled = (state2 & DISABLE2_QUICK_SETTINGS) != 0;

        if (disabled == mQsDisabled) return;

        mQsDisabled = disabled;

        updateEverything();

        updateEverything(isTunerEnabled);

    }



    public void updateEverything() {

    void updateEverything(boolean isTunerEnabled) {

        post(() -> {

            updateVisibilities();

            updateVisibilities(isTunerEnabled);

            updateClickabilities();

            setClickable(false);

        });
@@ -341,11 +273,10 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        mBuildText.setLongClickable(mBuildText.getVisibility() == View.VISIBLE);

    }



    private void updateVisibilities() {

    private void updateVisibilities(boolean isTunerEnabled) {

        mSettingsContainer.setVisibility(mQsDisabled ? View.GONE : View.VISIBLE);

        mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(

                TunerService.isTunerEnabled(mContext, mUserTracker.getUserHandle()) ? View.VISIBLE

                        : View.INVISIBLE);

                isTunerEnabled ? View.VISIBLE : View.INVISIBLE);

        final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);

        mMultiUserSwitch.setVisibility(showUserSwitcher() ? View.VISIBLE : View.INVISIBLE);

        mEditContainer.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);
@@ -358,78 +289,22 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        return mExpanded && mMultiUserSwitch.isMultiUserEnabled();

    }



    private void updateListeners() {

        if (mListening) {

            mUserInfoController.addCallback(this);

        } else {

            mUserInfoController.removeCallback(this);

        }

    }



    @Override

    /** */

    public void setQSPanel(final QSPanel qsPanel) {

        mQsPanel = qsPanel;

        if (mQsPanel != null) {

        if (qsPanel != null) {

            mMultiUserSwitch.setQsPanel(qsPanel);

            mQsPanel.setFooterPageIndicator(mPageIndicator);

            qsPanel.setFooterPageIndicator(mPageIndicator);

        }

    }



    @Override

    public void setQQSPanel(@Nullable QuickQSPanel panel) {

        mQuickQsPanel = panel;

    }



    @Override

    public void onClick(View v) {

        // Don't do anything until view are unhidden

        if (!mExpanded) {

            return;

        }



        if (v == mSettingsButton) {

            if (!mDeviceProvisionedController.isCurrentUserSetup()) {

                // If user isn't setup just unlock the device and dump them back at SUW.

                mActivityStarter.postQSRunnableDismissingKeyguard(() -> {

                });

                return;

            }

            MetricsLogger.action(mContext,

                    mExpanded ? MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH

                            : MetricsProto.MetricsEvent.ACTION_QS_COLLAPSED_SETTINGS_LAUNCH);

            if (mSettingsButton.isTunerClick()) {

                mActivityStarter.postQSRunnableDismissingKeyguard(() -> {

                    if (TunerService.isTunerEnabled(mContext, mUserTracker.getUserHandle())) {

                        TunerService.showResetRequest(mContext, mUserTracker.getUserHandle(),

                                () -> {

                                    // Relaunch settings so that the tuner disappears.

                                    startSettingsActivity();

                                });

                    } else {

                        Toast.makeText(getContext(), R.string.tuner_toast,

                                Toast.LENGTH_LONG).show();

                        TunerService.setTunerEnabled(mContext, mUserTracker.getUserHandle(), true);

                    }

                    startSettingsActivity();



                });

            } else {

                startSettingsActivity();

            }

        }

    }



    private void startSettingsActivity() {

        mActivityStarter.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS),

                true /* dismissShade */);

    }



    @Override

    public void onUserInfoChanged(String name, Drawable picture, String userAccount) {

        if (picture != null &&

                UserManager.get(mContext).isGuestUser(KeyguardUpdateMonitor.getCurrentUser()) &&

                !(picture instanceof UserIconDrawable)) {

            picture = picture.getConstantState().newDrawable(mContext.getResources()).mutate();

    void onUserInfoChanged(Drawable picture, boolean isGuestUser) {

        if (picture != null && isGuestUser && !(picture instanceof UserIconDrawable)) {

            picture = picture.getConstantState().newDrawable(getResources()).mutate();

            picture.setColorFilter(

                    Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorForeground),

                    Mode.SRC_IN);

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

0 → 100644
+241 −0
Original line number Diff line number Diff line 
/*

 * 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.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * 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.

 */



package com.android.systemui.qs;



import android.content.ClipData;

import android.content.ClipboardManager;

import android.content.Intent;

import android.graphics.drawable.Drawable;

import android.os.UserManager;

import android.text.TextUtils;

import android.view.View;

import android.widget.TextView;

import android.widget.Toast;



import androidx.annotation.Nullable;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.R;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.qs.dagger.QSScope;

import com.android.systemui.settings.UserTracker;

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

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

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

import com.android.systemui.tuner.TunerService;

import com.android.systemui.util.ViewController;



import javax.inject.Inject;



/**

 * Controller for {@link QSFooterView}.

 */

@QSScope

public class QSFooterViewController extends ViewController<QSFooterView> implements QSFooter {



    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;

    private final SettingsButton mSettingsButton;

    private final TextView mBuildText;

    private final View mEdit;



    private final UserInfoController.OnUserInfoChangedListener mOnUserInfoChangedListener =

            new UserInfoController.OnUserInfoChangedListener() {

        @Override

        public void onUserInfoChanged(String name, Drawable picture, String userAccount) {

            boolean isGuestUser = mUserManager.isGuestUser(KeyguardUpdateMonitor.getCurrentUser());

            mView.onUserInfoChanged(picture, isGuestUser);

        }

    };



    private final View.OnClickListener mSettingsOnClickListener = new View.OnClickListener() {

        @Override

        public void onClick(View v) {

            // Don't do anything until view are unhidden

            if (!mExpanded) {

                return;

            }



            if (v == mSettingsButton) {

                if (!mDeviceProvisionedController.isCurrentUserSetup()) {

                    // If user isn't setup just unlock the device and dump them back at SUW.

                    mActivityStarter.postQSRunnableDismissingKeyguard(() -> {

                    });

                    return;

                }

                mMetricsLogger.action(

                        mExpanded ? MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH

                                : MetricsProto.MetricsEvent.ACTION_QS_COLLAPSED_SETTINGS_LAUNCH);

                if (mSettingsButton.isTunerClick()) {

                    mActivityStarter.postQSRunnableDismissingKeyguard(() -> {

                        if (isTunerEnabled()) {

                            mTunerService.showResetRequest(

                                    mUserTracker.getUserHandle(),

                                    () -> {

                                        // Relaunch settings so that the tuner disappears.

                                        startSettingsActivity();

                                    });

                        } else {

                            Toast.makeText(getContext(), R.string.tuner_toast,

                                    Toast.LENGTH_LONG).show();

                            mTunerService.setTunerEnabled(mUserTracker.getUserHandle(), true);

                        }

                        startSettingsActivity();



                    });

                } else {

                    startSettingsActivity();

                }

            }

        }

    };



    private boolean mListening;

    private boolean mExpanded;



    @Inject

    QSFooterViewController(QSFooterView view, UserManager userManager,

            UserInfoController userInfoController, ActivityStarter activityStarter,

            DeviceProvisionedController deviceProvisionedController, UserTracker userTracker,

            QSPanelController qsPanelController, TunerService tunerService,

            MetricsLogger metricsLogger) {

        super(view);

        mUserManager = userManager;

        mUserInfoController = userInfoController;

        mActivityStarter = activityStarter;

        mDeviceProvisionedController = deviceProvisionedController;

        mUserTracker = userTracker;

        mQsPanelController = qsPanelController;

        mTunerService = tunerService;

        mMetricsLogger = metricsLogger;



        mSettingsButton = mView.findViewById(R.id.settings_button);

        mBuildText = mView.findViewById(R.id.build);

        mEdit = mView.findViewById(android.R.id.edit);

    }





    @Override

    protected void onViewAttached() {

        mSettingsButton.setOnClickListener(mSettingsOnClickListener);

        mBuildText.setOnLongClickListener(view -> {

            CharSequence buildText = mBuildText.getText();

            if (!TextUtils.isEmpty(buildText)) {

                ClipboardManager service =

                        mUserTracker.getUserContext().getSystemService(ClipboardManager.class);

                String label = getResources().getString(R.string.build_number_clip_data_label);

                service.setPrimaryClip(ClipData.newPlainText(label, buildText));

                Toast.makeText(getContext(), R.string.build_number_copy_toast, Toast.LENGTH_SHORT)

                        .show();

                return true;

            }

            return false;

        });



        mEdit.setOnClickListener(view ->

                mActivityStarter.postQSRunnableDismissingKeyguard(() ->

                        mQsPanelController.showEdit(view)));



        mView.updateEverything(isTunerEnabled());

    }



    @Override

    protected void onViewDetached() {

        setListening(false);

    }





    @Override

    public void setQSPanel(@Nullable QSPanel panel) {

        mView.setQSPanel(panel);

    }



    @Override

    public void setVisibility(int visibility) {

        mView.setVisibility(visibility);

    }



    @Override

    public void setExpanded(boolean expanded) {

        mExpanded = expanded;

        mView.setExpanded(expanded, isTunerEnabled());

    }





    @Override

    public int getHeight() {

        return mView.getHeight();

    }



    @Override

    public void setExpansion(float expansion) {

        mView.setExpansion(expansion);

    }



    @Override

    public void setListening(boolean listening) {

        if (mListening == listening) {

            return;

        }



        mListening = listening;

        if (mListening) {

            mUserInfoController.addCallback(mOnUserInfoChangedListener);

        } else {

            mUserInfoController.removeCallback(mOnUserInfoChangedListener);

        }

    }



    @Override

    public void setKeyguardShowing(boolean keyguardShowing) {

        mView.setKeyguardShowing();

    }



    /** */

    @Override

    public void setExpandClickListener(View.OnClickListener onClickListener) {

        mView.setExpandClickListener(onClickListener);

    }



    @Override

    public void setQQSPanel(@Nullable QuickQSPanel panel) {

        mView.setQQSPanel(panel);

    }



    @Override

    public void disable(int state1, int state2, boolean animate) {

        mView.disable(state2, isTunerEnabled());

    }





    private void startSettingsActivity() {

        mActivityStarter.startActivity(new Intent(android.provider.Settings.ACTION_SETTINGS),

                true /* dismissShade */);

    }



    private boolean isTunerEnabled() {

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

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -142,13 +142,13 @@ 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 = view.findViewById(R.id.qs_footer);

        mFooter = qsFragmentComponent.getQSFooter();



        mQSContainerImplController = qsFragmentComponent.getQSContainerImplController();

        mQSContainerImplController.init();

        mContainer = mQSContainerImplController.getView();



        mQSDetail.setQsPanel(mQSPanelController.getView(), mHeader, (View) mFooter);

        mQSDetail.setQsPanel(mQSPanelController.getView(), mHeader, mFooter);

        mQSAnimator = qsFragmentComponent.getQSAnimator();



        mQSCustomizer = view.findViewById(R.id.qs_customize);