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

Commit aef03313 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move screenshot thumbnail above actions" into main

parents e966da69 03ce8808

packages/SystemUI/res/layout/screenshot_shelf.xml

+6 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:elevation="4dp"

        android:background="@drawable/action_chip_container_background"

        android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal"

        android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom"

        android:layout_marginBottom="@dimen/screenshot_shelf_vertical_margin"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="@+id/actions_container"

        app:layout_constraintEnd_toEndOf="@+id/actions_container"
@@ -38,14 +38,14 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal"

        android:paddingEnd="@dimen/overlay_action_container_padding_end"

        android:paddingHorizontal="@dimen/overlay_action_container_padding_end"

        android:paddingVertical="@dimen/overlay_action_container_padding_vertical"

        android:elevation="4dp"

        android:scrollbars="none"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintWidth_percent="1.0"

        app:layout_constraintWidth_max="wrap"

        app:layout_constraintStart_toEndOf="@+id/screenshot_preview_border"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="@id/actions_container_background">

        <LinearLayout
@@ -65,16 +65,16 @@ 
        android:id="@+id/screenshot_preview_border"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginStart="16dp"

        android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal"

        android:layout_marginTop="@dimen/overlay_border_width_neg"

        android:layout_marginEnd="@dimen/overlay_border_width_neg"

        android:layout_marginBottom="14dp"

        android:layout_marginBottom="@dimen/screenshot_shelf_vertical_margin"

        android:elevation="8dp"

        android:background="@drawable/overlay_border"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="@id/screenshot_preview"

        app:layout_constraintEnd_toEndOf="@id/screenshot_preview"

        app:layout_constraintBottom_toBottomOf="parent"/>

        app:layout_constraintBottom_toTopOf="@id/actions_container"/>

    <ImageView

        android:id="@+id/screenshot_preview"

        android:layout_width="@dimen/overlay_x_scale"

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ 
    <dimen name="overlay_action_container_padding_end">8dp</dimen>

    <dimen name="overlay_dismiss_button_tappable_size">48dp</dimen>

    <dimen name="overlay_dismiss_button_margin">8dp</dimen>

    <dimen name="screenshot_shelf_vertical_margin">8dp</dimen>

    <!-- must be kept aligned with overlay_border_width_neg, below;

         overlay_border_width = overlay_border_width_neg * -1 -->

    <dimen name="overlay_border_width">4dp</dimen>