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

Commit 6a256fc1 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Make QS buttons squishy" into sc-v2-dev am: b19768ef 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16058353

Change-Id: Iecdd83664b9114fbfcf3f277745ddcd594b586c7
parents ca7f80f4 b19768ef

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

+3 −2
Original line number Diff line number Diff line
@@ -55,13 +55,14 @@ public interface QS extends FragmentBase { 


    /**

     * Asks QS to update its presentation, according to {@code NotificationPanelViewController}.

     *

     * @param qsExpansionFraction How much each UI element in QS should be expanded (QQS to QS.)

     * @param panelExpansionFraction Whats the expansion of the whole shade.

     * @param headerTranslation How much we should vertically translate QS.

     * @param squishinessFraction Fraction that affects tile height. 0 when collapsed,

     *                            1 when expanded.

     */

    void setQsExpansion(float qsExpansionFraction, float panelExpansionFraction,

            float headerTranslation);

            float headerTranslation, float squishinessFraction);

    void setHeaderListening(boolean listening);

    void notifyCustomizeChanged();

    void setContainerController(QSContainerController controller);

packages/SystemUI/res-keyguard/values-sw600dp-land/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ 
    <dimen name="widget_big_font_size">88dp</dimen>



    <dimen name="qs_header_system_icons_area_height">0dp</dimen>

    <dimen name="qs_panel_padding_top">0dp</dimen>

    <dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen>



</resources>
 
 No newline at end of file

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
                android:id="@+id/qqs_footer_actions"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

                android:layout_marginTop="@dimen/qqs_layout_margin_top"

                android:layout_marginStart="@dimen/qs_footer_margin"

                android:layout_marginEnd="@dimen/qs_footer_margin"

                />

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

+5 −0
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
        updateListening();

    }



    @Override

    public void setSquishinessFraction(float squishinessFraction) {

        // No-op, paged layouts are not squishy.

    }



    private void updateListening() {

        for (TileLayout tilePage : mPages) {

            tilePage.setListening(tilePage.getParent() != null && mListening);

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

+8 −6
Original line number Diff line number Diff line
@@ -316,8 +316,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 


                    if (mQQSTileHeightAnimator == null) {

                        mQQSTileHeightAnimator = new HeightExpansionAnimator(this,

                                quickTileView.getHeight(), tileView.getHeight());

                        qqsTileHeight = quickTileView.getHeight();

                                quickTileView.getMeasuredHeight(), tileView.getMeasuredHeight());

                        qqsTileHeight = quickTileView.getMeasuredHeight();

                    }



                    mQQSTileHeightAnimator.addView(quickTileView);
@@ -380,7 +380,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
                    if (mOtherTilesExpandAnimator == null) {

                        mOtherTilesExpandAnimator =

                                new HeightExpansionAnimator(

                                        this, qqsTileHeight, tileView.getHeight());

                                        this, qqsTileHeight, tileView.getMeasuredHeight());

                    }

                    mOtherTilesExpandAnimator.addView(tileView);

                    tileView.setClipChildren(true);
@@ -658,7 +658,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
        mTranslateWhileExpanding = shouldTranslate;

    }



    static class HeightExpansionAnimator {

    private static class HeightExpansionAnimator {

        private final List<View> mViews = new ArrayList<>();

        private final ValueAnimator mAnimator;

        private final TouchAnimator.Listener mListener;
@@ -673,9 +673,10 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
                int height = (Integer) valueAnimator.getAnimatedValue();

                for (int i = 0; i < viewCount; i++) {

                    View v = mViews.get(i);

                    v.setBottom(v.getTop() + height);

                    if (v instanceof HeightOverrideable) {

                        ((HeightOverrideable) v).setHeightOverride(height);

                    } else {

                        v.setBottom(v.getTop() + height);

                    }

                }

                if (t == 0f) {
@@ -713,9 +714,10 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
            final int viewsCount = mViews.size();

            for (int i = 0; i < viewsCount; i++) {

                View v = mViews.get(i);

                v.setBottom(v.getTop() + v.getMeasuredHeight());

                if (v instanceof HeightOverrideable) {

                    ((HeightOverrideable) v).resetOverride();

                } else {

                    v.setBottom(v.getTop() + v.getMeasuredHeight());

                }

            }

        }