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

Commit 517fffaa authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Do not allow division by 0" into rvc-dev

parents e4e42d37 9e20024b

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java

+3 −2
Original line number Diff line number Diff line
@@ -114,8 +114,9 @@ public class HeadsUpTouchHelper implements Gefingerpoken { 
                    mInitialTouchY = y;

                    int startHeight = (int) (mPickedChild.getActualHeight()

                                                + mPickedChild.getTranslationY());

                    mPanel.setPanelScrimMinFraction((float) startHeight

                            / mPanel.getMaxPanelHeight());

                    float maxPanelHeight = mPanel.getMaxPanelHeight();

                    mPanel.setPanelScrimMinFraction(maxPanelHeight > 0f

                            ? (float) startHeight / maxPanelHeight : 0f);

                    mPanel.startExpandMotion(x, y, true /* startTracking */, startHeight);

                    mPanel.startExpandingFromPeek();

                    // This call needs to be after the expansion start otherwise we will get a

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+8 −1
Original line number Diff line number Diff line
@@ -1844,7 +1844,14 @@ public class NotificationPanelViewController extends PanelViewController { 
        } else {

            maxHeight = calculatePanelHeightShade();

        }

        maxHeight = Math.max(maxHeight, min);

        maxHeight = Math.max(min, maxHeight);

        if (maxHeight == 0) {

            Log.wtf(TAG, "maxPanelHeight is 0. getOverExpansionAmount(): "

                    + getOverExpansionAmount() + ", calculatePanelHeightQsExpanded: "

                    + calculatePanelHeightQsExpanded() + ", calculatePanelHeightShade: "

                    + calculatePanelHeightShade() + ", mStatusBarMinHeight = "

                    + mStatusBarMinHeight + ", mQsMinExpansionHeight = " + mQsMinExpansionHeight);

        }

        return maxHeight;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.statusbar.phone;



import static java.lang.Float.isNaN;



import android.content.Context;

import android.os.Bundle;

import android.os.Parcelable;
@@ -161,6 +163,9 @@ public abstract class PanelBar extends FrameLayout { 
     *                 fraction as the panel also might be expanded if the fraction is 0

     */

    public void panelExpansionChanged(float frac, boolean expanded) {

        if (isNaN(frac)) {

            throw new IllegalArgumentException("frac cannot be NaN");

        }

        boolean fullyClosed = true;

        boolean fullyOpened = false;

        if (SPEW) LOG("panelExpansionChanged: start state=%d", mState);

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.systemui.statusbar.phone; 


import static com.android.systemui.ScreenDecorations.DisplayCutoutView.boundsFromDirection;



import static java.lang.Float.isNaN;



import android.annotation.Nullable;

import android.content.Context;

import android.content.res.Configuration;
@@ -254,6 +256,9 @@ public class PhoneStatusBarView extends PanelBar { 


    @Override

    public void panelScrimMinFractionChanged(float minFraction) {

        if (isNaN(minFraction)) {

            throw new IllegalArgumentException("minFraction cannot be NaN");

        }

        if (mMinFraction != minFraction) {

            mMinFraction = minFraction;

            updateScrimFraction();