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

Commit e8cd13d7 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge changes I737c4091,I89e88479 into sc-dev am: dcac024c am: f2c3ea56 

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

Change-Id: Idf38dc5ed185139aab6cb514674887f13b1927db
parents aefd5e9b f2c3ea56

packages/SystemUI/res/drawable/screenshot_border.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <solid android:color="?androidprv:attr/colorSurface"/>

    <corners android:radius="20dp"/>

    <corners android:radius="24dp"/>

</shape>

packages/SystemUI/res/layout/global_screenshot_static.xml

+5 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
        android:background="@drawable/screenshot_border"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/screenshot_preview_end"

        app:layout_constraintEnd_toEndOf="@+id/screenshot_preview_end"

        app:layout_constraintTop_toTopOf="@+id/screenshot_preview_top"/>

    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/screenshot_preview_end"
@@ -91,8 +91,7 @@ 
        android:id="@+id/global_screenshot_preview"

        android:visibility="invisible"

        android:layout_width="@dimen/global_screenshot_x_scale"

        android:layout_marginStart="4dp"

        android:layout_marginBottom="4dp"

        android:layout_margin="4dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:elevation="@dimen/screenshot_preview_elevation"
@@ -101,7 +100,9 @@ 
        android:background="@drawable/screenshot_preview_background"

        android:adjustViewBounds="true"

        app:layout_constraintBottom_toBottomOf="@+id/global_screenshot_preview_border"

        app:layout_constraintStart_toStartOf="@+id/global_screenshot_preview_border">

        app:layout_constraintStart_toStartOf="@+id/global_screenshot_preview_border"

        app:layout_constraintEnd_toEndOf="@+id/global_screenshot_preview_border"

        app:layout_constraintTop_toTopOf="@+id/global_screenshot_preview_border">

    </ImageView>

    <FrameLayout

        android:id="@+id/global_screenshot_dismiss_button"