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

Commit 29d1fec6 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Update long screenshot ui for extracted colors" into sc-dev am: e2e22284 

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

Change-Id: I53f947f1e0c79b48dcfbf01ca2a5921055c651cd
parents e9cf56df e2e22284

packages/SystemUI/res/layout/long_screenshot.xml

+17 −17
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:background="?android:colorBackgroundFloating"

    android:id="@+id/root"

    android:layout_width="match_parent"
@@ -30,6 +31,8 @@ 
        android:layout_height="wrap_content"

        android:text="@string/save"

        android:layout_marginLeft="8dp"

        android:backgroundTint="?androidprv:attr/colorAccentSecondary"

        android:textColor="?androidprv:attr/textColorSecondary"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@id/preview" />
@@ -40,7 +43,7 @@ 
        android:tint="?android:textColorPrimary"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:padding="6dp"

        android:padding="12dp"

        android:src="@drawable/ic_screenshot_share"

        android:layout_marginRight="8dp"

        android:contentDescription="@*android:string/share"
@@ -80,7 +83,7 @@ 
        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:handleThickness="@dimen/screenshot_crop_handle_thickness"

        app:handleColor="@*android:color/accent_device_default"

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

        app:scrimColor="@color/screenshot_crop_scrim"

        tools:background="?android:colorBackground"

        tools:minHeight="100dp"
@@ -95,29 +98,26 @@ 
        app:layout_constraintTop_toTopOf="@id/preview"

        app:layout_constraintLeft_toLeftOf="parent"

        app:handleThickness="@dimen/screenshot_crop_handle_thickness"

        app:handleColor="@*android:color/accent_device_default"

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

        app:scrimColor="@color/screenshot_crop_scrim"

        app:borderThickness="4dp"

        app:borderColor="#fff"

        />



    <Button

    <ImageButton

        android:id="@+id/edit"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="8dp"

        android:layout_width="56dp"

        android:layout_height="56dp"

        android:layout_marginBottom="16dp"

        android:layout_marginEnd="16dp"

        style="@android:style/Widget.DeviceDefault.Button.Colored"

        android:backgroundTint="?android:colorBackground"

        android:drawableStart="@drawable/ic_screenshot_edit"

        android:drawableTint="?android:textColorPrimary"

        android:paddingStart="16dp"

        android:paddingEnd="8dp"

        android:paddingVertical="8dp"

        android:textColor="?android:textColorPrimary"

        android:text="@string/screenshot_edit_label"

        android:backgroundTint="?androidprv:attr/colorAccentSecondary"

        android:src="@drawable/ic_screenshot_edit"

        android:tint="?androidprv:attr/textColorSecondary"

        android:padding="16dp"

        android:scaleType="fitCenter"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintLeft_toLeftOf="parent"

        app:layout_constraintRight_toRightOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

    />



    <ImageView