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

Commit 208f3822 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Make side labels layout for QS default 

Side labels default only depends on the overlay flag.
Slightly improve animations

Test: manual
Bug: 171319433
Change-Id: Id109c536aed49c1de432de335752e5f7631a0990
parent 2d37557f

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2816,4 +2816,6 @@ 


    <!-- No translation [CHAR LIMIT=0] -->

    <string name="qs_remove_labels" translatable="false"></string>



    <string name="qs_tile_label_fontFamily" translatable="false">@*android:string/config_headlineFontFamily</string>

</resources>

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 


    <style name="TextAppearance.QS.TileLabel">

        <item name="android:textSize">@dimen/qs_tile_text_size</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:fontFamily">@string/qs_tile_label_fontFamily</item>

    </style>



    <style name="TextAppearance.QS.TileLabel.Secondary">

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

+12 −1
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import com.android.systemui.qs.QSPanel.QSTileLayout; 
import com.android.systemui.qs.TouchAnimator.Builder;

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

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

import com.android.systemui.qs.tileimpl.QSTileBaseView;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.tuner.TunerService.Tunable;
@@ -87,11 +89,13 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
    private final Executor mExecutor;

    private final TunerService mTunerService;

    private boolean mShowCollapsedOnKeyguard;

    private final FeatureFlags mFeatureFlags;



    @Inject

    public QSAnimator(QS qs, QuickQSPanel quickPanel, QSPanelController qsPanelController,

            QuickQSPanelController quickQSPanelController, QSTileHost qsTileHost,

            QSSecurityFooter securityFooter, @Main Executor executor, TunerService tunerService) {

            QSSecurityFooter securityFooter, @Main Executor executor, TunerService tunerService,

            FeatureFlags featureFlags) {

        mQs = qs;

        mQuickQsPanel = quickPanel;

        mQsPanelController = qsPanelController;
@@ -100,6 +104,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
        mHost = qsTileHost;

        mExecutor = executor;

        mTunerService = tunerService;

        mFeatureFlags = featureFlags;

        mHost.addCallback(this);

        mQsPanelController.addOnAttachStateChangeListener(this);

        qs.getView().addOnLayoutChangeListener(this);
@@ -228,6 +233,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
                // Quick tiles.

                QSTileView quickTileView = mQuickQSPanelController.getTileView(tile);

                if (quickTileView == null) continue;

                View qqsBgCircle = ((QSTileBaseView) quickTileView).getBgCircle();



                getRelativePosition(loc1, quickTileView.getIcon().getIconView(), view);

                getRelativePosition(loc2, tileIcon, view);
@@ -249,6 +255,11 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
                    translationXBuilder.addFloat(tileView, "translationX", -xDiff, 0);

                    translationYBuilder.addFloat(tileView, "translationY", -yDiff, 0);



                    if (mFeatureFlags.isQSLabelsEnabled()) {

                        firstPageBuilder.addFloat(qqsBgCircle, "alpha", 1, 1, 0);

                        mAllViews.add(qqsBgCircle);

                    }



                } else { // These tiles disappear when expanding

                    firstPageBuilder.addFloat(quickTileView, "alpha", 1, 0);

                    translationYBuilder.addFloat(quickTileView, "translationY", 0, yDiff);

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

+0 −4
Original line number Diff line number Diff line
@@ -777,10 +777,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
        updatePadding();

    }



    boolean useSideLabels() {

        return mSideLabels;

    }



    private class H extends Handler {

        private static final int SHOW_DETAIL = 1;

        private static final int SET_TILE_VISIBILITY = 2;

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

+2 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.qs; 
import static com.android.systemui.media.dagger.MediaModule.QS_PANEL;

import static com.android.systemui.qs.QSPanel.QS_SHOW_BRIGHTNESS;

import static com.android.systemui.qs.dagger.QSFlagsModule.QS_LABELS_FLAG;

import static com.android.systemui.qs.dagger.QSFlagsModule.QS_SIDE_LABELS;

import static com.android.systemui.qs.dagger.QSFragmentModule.QS_USING_MEDIA_PLAYER;



import android.annotation.NonNull;
@@ -93,8 +92,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
            DumpManager dumpManager, MetricsLogger metricsLogger, UiEventLogger uiEventLogger,

            QSLogger qsLogger, BrightnessController.Factory brightnessControllerFactory,

            BrightnessSlider.Factory brightnessSliderFactory,

            @Named(QS_LABELS_FLAG) boolean qsLabelsFlag,

            @Named(QS_SIDE_LABELS) boolean useSideLabels) {

            @Named(QS_LABELS_FLAG) boolean qsLabelsFlag) {

        super(view, qstileHost, qsCustomizerController, usingMediaPlayer, mediaHost,

                metricsLogger, uiEventLogger, qsLogger, dumpManager);

        mQsSecurityFooter = qsSecurityFooter;
@@ -110,7 +108,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
        mBrightnessController = brightnessControllerFactory.create(mBrightnessSlider);



        mQsLabelsFlag = qsLabelsFlag;

        mSideLabels = useSideLabels;

        mSideLabels = qsLabelsFlag;

    }



    @Override