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

Commit 9e64f826 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Do not allow ScrimView backgrounds" into pi-dev 

am: b6238ed5

Change-Id: If02fcf7c2347f31d36067ac06672cfa361653fa7
parents d2832e32 b6238ed5

packages/SystemUI/res/layout/super_status_bar.xml

+4 −2
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ 
                   android:visibility="invisible" />

    </com.android.systemui.statusbar.BackDropView>



    <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_behind"

    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_behind"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"
@@ -75,7 +76,8 @@ 
        android:layout_height="match_parent"

        android:visibility="invisible" />



    <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_in_front"

    <com.android.systemui.statusbar.ScrimView

        android:id="@+id/scrim_in_front"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:importantForAccessibility="no"

packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java

+5 −12
Original line number Diff line number Diff line
@@ -106,6 +106,11 @@ public class ScrimView extends View implements ConfigurationController.Configura 
                Utils.getThemeAttr(mContext, android.R.attr.dialogCornerRadius));

    }



    @Override

    public void setBackground(Drawable background) {

        Log.wtfStack(TAG, "ScrimView should never have a background.");

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);
@@ -321,18 +326,6 @@ public class ScrimView extends View implements ConfigurationController.Configura 
        return mViewAlpha;

    }



    public void animateViewAlpha(float alpha, long durationOut, Interpolator interpolator) {

        if (mAlphaAnimator != null) {

            mAlphaAnimator.cancel();

        }

        mAlphaAnimator = ValueAnimator.ofFloat(getViewAlpha(), alpha);

        mAlphaAnimator.addUpdateListener(mAlphaUpdateListener);

        mAlphaAnimator.addListener(mClearAnimatorListener);

        mAlphaAnimator.setInterpolator(interpolator);

        mAlphaAnimator.setDuration(durationOut);

        mAlphaAnimator.start();

    }



    public void setExcludedArea(Rect area) {

        if (area == null) {

            mHasExcludedArea = false;