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

Commit 03ad4e00 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Update long screenshot crop ui contrast" into sc-dev am: 00b88300 

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

Change-Id: I20339562f3fafd07c78bb41b8e249f5ae0215e50
parents 8beddc32 00b88300

packages/SystemUI/res/layout/long_screenshot.xml

+6 −4
Original line number Diff line number Diff line
@@ -98,8 +98,9 @@ 
        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:handleThickness="@dimen/screenshot_crop_handle_thickness"

        app:handleColor="?androidprv:attr/colorAccentPrimary"

        app:scrimColor="@color/screenshot_crop_scrim"

        app:handleColor="?android:attr/colorAccent"

        app:scrimColor="?android:colorBackgroundFloating"

        app:scrimAlpha="128"

        app:containerBackgroundColor="?android:colorBackgroundFloating"

        tools:background="?android:colorBackground"

        tools:minHeight="100dp"
@@ -114,8 +115,9 @@ 
        app:layout_constraintTop_toTopOf="@id/preview"

        app:layout_constraintLeft_toLeftOf="parent"

        app:handleThickness="@dimen/screenshot_crop_handle_thickness"

        app:handleColor="?androidprv:attr/colorAccentSecondary"

        app:scrimColor="@color/screenshot_crop_scrim"

        app:handleColor="?android:attr/colorAccent"

        app:scrimColor="?android:colorBackgroundFloating"

        app:scrimAlpha="128"

        app:borderThickness="4dp"

        app:borderColor="#fff"

        />

packages/SystemUI/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ 
    <attr name="handleThickness" format="dimension" />

    <attr name="handleColor" format="color" />

    <attr name="scrimColor" format="color" />

    <!-- Int [0,255] for the alpha to be applied to scrimColor -->

    <attr name="scrimAlpha" format="integer" />

    <attr name="containerBackgroundColor" format="color" />



    <attr name="isVertical" format="boolean" />
@@ -179,6 +181,7 @@ 
        <attr name="handleThickness" />

        <attr name="handleColor" />

        <attr name="scrimColor" />

        <attr name="scrimAlpha" />

        <attr name="containerBackgroundColor" />

    </declare-styleable>
@@ -186,6 +189,7 @@ 
        <attr name="handleThickness" />

        <attr name="handleColor" />

        <attr name="scrimColor" />

        <attr name="scrimAlpha" />

        <attr name="borderThickness" format="dimension" />

        <attr name="borderColor" format="color" />

    </declare-styleable>

packages/SystemUI/res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -199,9 +199,6 @@ 
    <color name="global_screenshot_button_ripple">#1f000000</color>

    <color name="global_screenshot_background_protection_start">#40000000</color> <!-- 25% black -->



    <!-- Long screenshot UI -->

    <color name="screenshot_crop_scrim">#6444</color>



    <!-- GM2 colors -->

    <color name="GM2_grey_50">#F8F9FA</color>

    <color name="GM2_grey_100">#F1F3F4</color>

packages/SystemUI/src/com/android/systemui/screenshot/CropView.java

+4 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; 
import androidx.customview.widget.ExploreByTouchHelper;

import androidx.interpolator.view.animation.FastOutSlowInInterpolator;



import com.android.internal.graphics.ColorUtils;

import com.android.systemui.R;



import java.util.List;
@@ -95,7 +96,9 @@ public class CropView extends View { 
        TypedArray t = context.getTheme().obtainStyledAttributes(

                attrs, R.styleable.CropView, 0, 0);

        mShadePaint = new Paint();

        mShadePaint.setColor(t.getColor(R.styleable.CropView_scrimColor, Color.TRANSPARENT));

        int alpha = t.getInteger(R.styleable.CropView_scrimAlpha, 255);

        int scrimColor = t.getColor(R.styleable.CropView_scrimColor, Color.TRANSPARENT);

        mShadePaint.setColor(ColorUtils.setAlphaComponent(scrimColor, alpha));

        mContainerBackgroundPaint = new Paint();

        mContainerBackgroundPaint.setColor(t.getColor(R.styleable.CropView_containerBackgroundColor,

                Color.TRANSPARENT));

packages/SystemUI/src/com/android/systemui/screenshot/MagnifierView.java

+4 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.view.ViewPropertyAnimator; 


import androidx.annotation.Nullable;



import com.android.internal.graphics.ColorUtils;

import com.android.systemui.R;



/**
@@ -83,7 +84,9 @@ public class MagnifierView extends View implements CropView.CropInteractionListe 
        TypedArray t = context.getTheme().obtainStyledAttributes(

                attrs, R.styleable.MagnifierView, 0, 0);

        mShadePaint = new Paint();

        mShadePaint.setColor(t.getColor(R.styleable.MagnifierView_scrimColor, Color.TRANSPARENT));

        int alpha = t.getInteger(R.styleable.MagnifierView_scrimAlpha, 255);

        int scrimColor = t.getColor(R.styleable.MagnifierView_scrimColor, Color.TRANSPARENT);

        mShadePaint.setColor(ColorUtils.setAlphaComponent(scrimColor, alpha));

        mHandlePaint = new Paint();

        mHandlePaint.setColor(t.getColor(R.styleable.MagnifierView_handleColor, Color.BLACK));

        mHandlePaint.setStrokeWidth(