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

Commit d42b2922 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Remove docked task mode divider shadow"

parents c328e317 c33334ed

core/java/com/android/internal/policy/DecorView.java

+0 −38
Original line number Diff line number Diff line
@@ -57,14 +57,12 @@ import android.content.res.Resources; 
import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Insets;

import android.graphics.LinearGradient;

import android.graphics.Outline;

import android.graphics.Paint;

import android.graphics.PixelFormat;

import android.graphics.RecordingCanvas;

import android.graphics.Rect;

import android.graphics.Region;

import android.graphics.Shader;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.InsetDrawable;
@@ -274,9 +272,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
    private boolean mApplyFloatingVerticalInsets = false;

    private boolean mApplyFloatingHorizontalInsets = false;



    private final int mResizeShadowSize;

    private final Paint mVerticalResizeShadowPaint = new Paint();

    private final Paint mHorizontalResizeShadowPaint = new Paint();

    private final Paint mLegacyNavigationBarBackgroundPaint = new Paint();

    private Insets mBackgroundInsets = Insets.NONE;

    private Insets mLastBackgroundInsets = Insets.NONE;
@@ -317,10 +312,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 


        updateLogTag(params);



        mResizeShadowSize = context.getResources().getDimensionPixelSize(

                R.dimen.resize_shadow_size);

        initResizingPaints();



        mLegacyNavigationBarBackgroundPaint.setColor(Color.BLACK);

    }
@@ -2447,38 +2438,9 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 


    @Override

    public void onPostDraw(RecordingCanvas canvas) {

        drawResizingShadowIfNeeded(canvas);

        drawLegacyNavigationBarBackground(canvas);

    }



    private void initResizingPaints() {

        final int startColor = mContext.getResources().getColor(

                R.color.resize_shadow_start_color, null);

        final int endColor = mContext.getResources().getColor(

                R.color.resize_shadow_end_color, null);

        final int middleColor = (startColor + endColor) / 2;

        mHorizontalResizeShadowPaint.setShader(new LinearGradient(

                0, 0, 0, mResizeShadowSize, new int[] { startColor, middleColor, endColor },

                new float[] { 0f, 0.3f, 1f }, Shader.TileMode.CLAMP));

        mVerticalResizeShadowPaint.setShader(new LinearGradient(

                0, 0, mResizeShadowSize, 0, new int[] { startColor, middleColor, endColor },

                new float[] { 0f, 0.3f, 1f }, Shader.TileMode.CLAMP));

    }



    private void drawResizingShadowIfNeeded(RecordingCanvas canvas) {

        if (mWindow.mIsFloating || mWindow.isTranslucent() || mWindow.isShowingWallpaper()) {

            return;

        }

        canvas.save();

        canvas.translate(0, getHeight() - mFrameOffsets.bottom);

        canvas.drawRect(0, 0, getWidth(), mResizeShadowSize, mHorizontalResizeShadowPaint);

        canvas.restore();

        canvas.save();

        canvas.translate(getWidth() - mFrameOffsets.right, 0);

        canvas.drawRect(0, 0, mResizeShadowSize, getHeight(), mVerticalResizeShadowPaint);

        canvas.restore();

    }



    private void drawLegacyNavigationBarBackground(RecordingCanvas canvas) {

        if (!mDrawLegacyNavigationBarBackground || mDrawLegacyNavigationBarBackgroundHandled) {

            return;

core/res/res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -211,9 +211,6 @@ 
    <color name="SIM_color_orange">#ff995400</color><!-- Material Custom Orange -->

    <color name="SIM_dark_mode_color_orange">#fffcad70</color><!-- Material Orange 300 -->



    <color name="resize_shadow_start_color">#2a000000</color>

    <color name="resize_shadow_end_color">#00000000</color>



    <color name="tooltip_background_dark">#e6616161</color>

    <color name="tooltip_background_light">#e6FFFFFF</color>

core/res/res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -721,8 +721,6 @@ 


    <item type="fraction" name="docked_stack_divider_fixed_ratio">34.15%</item>



    <dimen name="resize_shadow_size">5dp</dimen>



    <!-- The default minimal size of a resizable task, in both dimensions. -->

    <dimen name="default_minimal_size_resizable_task">220dp</dimen>

core/res/res/values/symbols.xml

+0 −3
Original line number Diff line number Diff line
@@ -1695,9 +1695,6 @@ 
  <java-symbol type="fraction" name="docked_stack_divider_fixed_ratio" />

  <java-symbol type="fraction" name="thumbnail_fullscreen_scale" />

  <java-symbol type="integer" name="thumbnail_width_tv" />

  <java-symbol type="dimen" name="resize_shadow_size" />

  <java-symbol type="color" name="resize_shadow_start_color" />

  <java-symbol type="color" name="resize_shadow_end_color" />

  <java-symbol type="dimen" name="navigation_bar_height" />

  <java-symbol type="dimen" name="navigation_bar_height_landscape" />

  <java-symbol type="dimen" name="navigation_bar_width" />