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

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

Merge changes I221089d1,Ie3c7a665 

* changes:
  Fix clipboard overlay in dark mode and RTL
  Rename attrs/files shared between clipboard and screenshots
parents 51e42e93 2ba829db

packages/SystemUI/res/drawable/action_chip_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
<ripple

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

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

    android:color="@color/screenshot_button_ripple">

    android:color="@color/overlay_button_ripple">

    <item android:id="@android:id/background">

        <shape android:shape="rectangle">

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

            <corners android:radius="@dimen/screenshot_button_corner_radius"/>

            <corners android:radius="@dimen/overlay_button_corner_radius"/>

        </shape>

    </item>

</ripple>

packages/SystemUI/res/drawable/action_chip_container_background.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="@dimen/screenshot_action_container_corner_radius"/>

    <corners android:radius="@dimen/overlay_action_container_corner_radius"/>

</shape>

packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml→packages/SystemUI/res/drawable/overlay_actions_background_protection.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <gradient

        android:angle="90"

        android:startColor="@color/screenshot_background_protection_start"

        android:startColor="@color/overlay_background_protection_start"

        android:endColor="#00000000"/>

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/clipboard_overlay.xml

+7 −7
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<com.android.systemui.clipboardoverlay.DraggableConstraintLayout

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

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

    android:theme="@style/Screenshot"

    android:theme="@style/FloatingOverlay"

    android:alpha="0"

    android:layout_width="match_parent"

    android:layout_height="match_parent">
@@ -28,7 +28,7 @@ 
        android:layout_width="0dp"

        android:elevation="1dp"

        android:background="@drawable/action_chip_container_background"

        android:layout_marginStart="@dimen/screenshot_action_container_margin_horizontal"

        android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal"

        app:layout_constraintBottom_toBottomOf="@+id/actions_container"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="@+id/actions_container"
@@ -37,9 +37,9 @@ 
        android:id="@+id/actions_container"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/screenshot_action_container_margin_horizontal"

        android:paddingEnd="@dimen/screenshot_action_container_padding_right"

        android:paddingVertical="@dimen/screenshot_action_container_padding_vertical"

        android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal"

        android:paddingEnd="@dimen/overlay_action_container_padding_right"

        android:paddingVertical="@dimen/overlay_action_container_padding_vertical"

        android:elevation="1dp"

        android:scrollbars="none"

        app:layout_constraintHorizontal_bias="0"
@@ -53,9 +53,9 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:animateLayoutChanges="true">

            <include layout="@layout/screenshot_action_chip"

            <include layout="@layout/overlay_action_chip"

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

            <include layout="@layout/screenshot_action_chip"

            <include layout="@layout/overlay_action_chip"

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

        </LinearLayout>

    </HorizontalScrollView>