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

Commit 48242f0a authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Don't run expand/collapse animations when dismissing. 

Also restore some padding.

Change-Id: Iada58be574c52651931ea733aaa4022c71e136b5
Fixes: 30764259
Fixes: 30781039
parent fc134485

packages/SystemUI/res/layout/volume_zen_footer.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    android:id="@+id/volume_zen_footer"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical" > <!-- extends LinearLayout -->

    android:orientation="vertical"

    android:paddingBottom="8dp" > <!-- extends LinearLayout -->



    <View

        android:id="@+id/zen_embedded_divider"

packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java

+32 −30
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ public class VolumeDialog implements TunerService.Tunable { 
        mMotion.startDismiss(new Runnable() {

            @Override

            public void run() {

                updateExpandedH(false);

                updateExpandedH(false /* expanding */, true /* dismissing */);

            }

        });

        if (mAccessibilityMgr.isEnabled()) {
@@ -541,14 +541,16 @@ public class VolumeDialog implements TunerService.Tunable { 
        mHandler.sendEmptyMessageDelayed(H.UPDATE_BOTTOM_MARGIN, getConservativeCollapseDuration());

    }



    private void updateExpandedH(final boolean expanded) {

    private void updateExpandedH(final boolean expanded, final boolean dismissing) {

        if (mExpanded == expanded) return;

        mExpanded = expanded;

        mExpandButtonAnimationRunning = isAttached();

        if (D.BUG) Log.d(TAG, "updateExpandedH " + expanded);

        updateExpandButtonH();

        updateFooterH();

        TransitionManager.endTransitions(mDialogView);

        final VolumeRow activeRow = getActiveRow();

        if (!dismissing) {

            mWindow.setLayout(mWindow.getAttributes().width, ViewGroup.LayoutParams.MATCH_PARENT);

            AutoTransition transition = new AutoTransition();

            transition.setDuration(mExpandButtonAnimationDuration);
@@ -566,20 +568,20 @@ public class VolumeDialog implements TunerService.Tunable { 


                @Override

                public void onTransitionCancel(Transition transition) {

                mWindow.setLayout(

                        mWindow.getAttributes().width, ViewGroup.LayoutParams.WRAP_CONTENT);

                }



                @Override

                public void onTransitionPause(Transition transition) {

                    mWindow.setLayout(

                            mWindow.getAttributes().width, ViewGroup.LayoutParams.WRAP_CONTENT);

                }



                @Override

                public void onTransitionResume(Transition transition) {

                }

            });

        TransitionManager.endTransitions(mDialogView);

            TransitionManager.beginDelayedTransition(mDialogView, transition);

        }

        updateRowsH(activeRow);

        rescheduleTimeoutH();

    }
@@ -1029,7 +1031,7 @@ public class VolumeDialog implements TunerService.Tunable { 
            if (mExpandButtonAnimationRunning) return;

            final boolean newExpand = !mExpanded;

            Events.writeEvent(mContext, Events.EVENT_EXPAND, newExpand);

            updateExpandedH(newExpand);

            updateExpandedH(newExpand, false /* dismissing */);

        }

    };