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

Commit 9882c62f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I635afaaf,Icdd62155 into sc-dev 

* changes:
  DO NOT MERGE Fixed the padding of quick settings
  Fix drag down animation when bypassing
parents d3f247be a501b9b9

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java

+0 −7
Original line number Diff line number Diff line
@@ -52,13 +52,6 @@ public interface QS extends FragmentBase { 
    void setListening(boolean listening);

    boolean isShowingDetail();

    void closeDetail();



    /**

     * Set that we're currently pulse expanding

     *

     * @param pulseExpanding if we're currently expanding during pulsing

     */

    default void setPulseExpanding(boolean pulseExpanding) {}

    void animateHeaderSlidingOut();

    void setQsExpansion(float qsExpansionFraction, float headerTranslation);

    void setHeaderListening(boolean listening);

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
        android:clipChildren="false"

        android:clipToPadding="false"

        android:focusable="true"

        android:paddingBottom="10dp"

        android:paddingBottom="24dp"

        android:importantForAccessibility="yes" />

    </RelativeLayout>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ 
    <dimen name="lockscreen_shade_notification_movement">24dp</dimen>



    <!-- Maximum overshoot for the pulse expansion -->

    <dimen name="pulse_expansion_max_top_overshoot">16dp</dimen>

    <dimen name="pulse_expansion_max_top_overshoot">32dp</dimen>



    <dimen name="people_space_widget_radius">28dp</dimen>

    <dimen name="people_space_image_radius">20dp</dimen>

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

+6 −9
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

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

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

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

import com.android.systemui.util.InjectionInflationController;
@@ -69,6 +70,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    private final Rect mQsBounds = new Rect();

    private final StatusBarStateController mStatusBarStateController;

    private final FalsingManager mFalsingManager;

    private final KeyguardBypassController mBypassController;

    private boolean mQsExpanded;

    private boolean mHeaderAnimating;

    private boolean mStackScrollerOverscrolling;
@@ -135,6 +137,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
            StatusBarStateController statusBarStateController, CommandQueue commandQueue,

            QSDetailDisplayer qsDetailDisplayer, @Named(QS_PANEL) MediaHost qsMediaHost,

            @Named(QUICK_QS_PANEL) MediaHost qqsMediaHost,

            KeyguardBypassController keyguardBypassController,

            QSFragmentComponent.Factory qsComponentFactory, FeatureFlags featureFlags,

            FalsingManager falsingManager) {

        mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler;
@@ -148,6 +151,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        mHost = qsTileHost;

        mFeatureFlags = featureFlags;

        mFalsingManager = falsingManager;

        mBypassController = keyguardBypassController;

        mStatusBarStateController = statusBarStateController;

    }
@@ -380,16 +384,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
        return mStatusBarStateController.getState() == StatusBarState.KEYGUARD;

    }



    @Override

    public void setPulseExpanding(boolean pulseExpanding) {

        if (pulseExpanding != mPulseExpanding) {

            mPulseExpanding = pulseExpanding;

            updateShowCollapsedOnKeyguard();

        }

    }



    private void updateShowCollapsedOnKeyguard() {

        boolean showCollapsed = mPulseExpanding || mTransitioningToFullShade;

        boolean showCollapsed = mBypassController.getBypassEnabled() || mTransitioningToFullShade;

        if (showCollapsed != mShowCollapsedOnKeyguard) {

            mShowCollapsedOnKeyguard = showCollapsed;

            updateQsState();
@@ -719,5 +715,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    public void onStateChanged(int newState) {

        mState = newState;

        setKeyguardShowing(newState == StatusBarState.KEYGUARD);

        updateShowCollapsedOnKeyguard();

    }

}

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

+16 −3
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ public class QSPanel extends LinearLayout implements Tunable { 
    private static final String TAG = "QSPanel";



    protected final Context mContext;

    private final int mMediaTopMargin;

    private final int mMediaTotalBottomMargin;



    /**

     * The index where the content starts that needs to be moved between parents
@@ -99,13 +101,14 @@ public class QSPanel extends LinearLayout implements Tunable { 
    protected LinearLayout mHorizontalContentContainer;



    protected QSTileLayout mTileLayout;

    private int mMediaTotalBottomMargin;



    public QSPanel(Context context, AttributeSet attrs) {

        super(context, attrs);

        mUsingMediaPlayer = useQsMediaPlayer(context);

        mMediaTotalBottomMargin = getResources().getDimensionPixelSize(

                R.dimen.quick_settings_bottom_margin_media);

        mMediaTopMargin = getResources().getDimensionPixelSize(

                R.dimen.qs_tile_margin_vertical);

        mContext = context;



        setOrientation(VERTICAL);
@@ -328,7 +331,7 @@ public class QSPanel extends LinearLayout implements Tunable { 
    private void updateHorizontalLinearLayoutMargins() {

        if (mHorizontalLinearLayout != null && !displayMediaMarginsOnMedia()) {

            LayoutParams lp = (LayoutParams) mHorizontalLinearLayout.getLayoutParams();

            lp.bottomMargin = mMediaTotalBottomMargin - getPaddingBottom();

            lp.bottomMargin = Math.max(mMediaTotalBottomMargin - getPaddingBottom(), 0);

            mHorizontalLinearLayout.setLayoutParams(lp);

        }

    }
@@ -343,6 +346,13 @@ public class QSPanel extends LinearLayout implements Tunable { 
        return true;

    }



    /**

     * @return true if the media view needs margin on the top to separate it from the qs tiles

     */

    protected boolean mediaNeedsTopMargin() {

        return false;

    }



    private boolean needsDynamicRowsAndColumns() {

        return true;

    }
@@ -411,7 +421,9 @@ public class QSPanel extends LinearLayout implements Tunable { 
            // necessary if the view isn't horizontal, since otherwise the padding is

            // carried in the parent of this view (to ensure correct vertical alignment)

            layoutParams.bottomMargin = !horizontal || displayMediaMarginsOnMedia()

                    ? mMediaTotalBottomMargin - getPaddingBottom() : 0;

                    ? Math.max(mMediaTotalBottomMargin - getPaddingBottom(), 0) : 0;

            layoutParams.topMargin = mediaNeedsTopMargin() && !horizontal

                    ? mMediaTopMargin : 0;

        }

    }
@@ -674,6 +686,7 @@ public class QSPanel extends LinearLayout implements Tunable { 
                mTileLayout.setMaxColumns(horizontal ? 2 : 4);

            }

            updateMargins(mediaHostView);

            mHorizontalLinearLayout.setVisibility(horizontal ? View.VISIBLE : View.GONE);

        }

    }