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

Commit 4cb5c00b authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Animate in share/edit buttons immediately."

parents 4dce73d5 75b334c6

packages/SystemUI/res/layout-land/global_screenshot_preview.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ 
    android:visibility="gone"

    android:background="@drawable/screenshot_rounded_corners"

    android:adjustViewBounds="true"

    android:contentDescription="@string/screenshot_preview_description"

    android:contentDescription="@string/screenshot_edit"

    app:layout_constraintBottom_toBottomOf="parent"

    app:layout_constraintStart_toStartOf="parent"/>
 
 No newline at end of file

packages/SystemUI/res/layout/global_screenshot_action_chip.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:id="@+id/global_screenshot_action_chip"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginEnd="@dimen/screenshot_action_chip_margin_right"

    android:layout_marginStart="@dimen/screenshot_action_chip_margin_start"

    android:paddingVertical="@dimen/screenshot_action_chip_margin_vertical"

    android:layout_gravity="center"

    android:gravity="center"

packages/SystemUI/res/layout/global_screenshot_preview.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ 
    android:visibility="gone"

    android:background="@drawable/screenshot_rounded_corners"

    android:adjustViewBounds="true"

    android:contentDescription="@string/screenshot_preview_description"

    android:contentDescription="@string/screenshot_edit"

    app:layout_constraintBottom_toBottomOf="parent"

    app:layout_constraintStart_toStartOf="parent"/>
 
 No newline at end of file

packages/SystemUI/res/layout/global_screenshot_static.xml

+6 −1
Original line number Diff line number Diff line
@@ -51,7 +51,12 @@ 
        <LinearLayout

            android:id="@+id/global_screenshot_actions"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

            android:layout_height="wrap_content">

            <include layout="@layout/global_screenshot_action_chip"

                     android:id="@+id/screenshot_share_chip"/>

            <include layout="@layout/global_screenshot_action_chip"

                     android:id="@+id/screenshot_edit_chip"/>

        </LinearLayout>

    </HorizontalScrollView>

    <include layout="@layout/global_screenshot_preview"/>

</androidx.constraintlayout.widget.ConstraintLayout>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ 
    <dimen name="screenshot_action_container_padding_right">8dp</dimen>

    <!-- Radius of the chip background on global screenshot actions -->

    <dimen name="screenshot_button_corner_radius">20dp</dimen>

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

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

    <dimen name="screenshot_action_chip_margin_vertical">10dp</dimen>

    <dimen name="screenshot_action_chip_padding_vertical">7dp</dimen>

    <dimen name="screenshot_action_chip_icon_size">18dp</dimen>