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

Commit 872437cd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update screenshot actions shade to spec" into rvc-dev am: cc25bf46 am: 0fae2957 

Change-Id: Iee0137e2bb331ad04122260932dbafb0547caae6
parents 42d46b3d 0fae2957

packages/SystemUI/res/layout/global_screenshot.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -32,10 +32,10 @@ 
        android:alpha="0"/>

        android:alpha="0"/>

    <HorizontalScrollView

    <HorizontalScrollView

        android:id="@+id/global_screenshot_actions_container"

        android:id="@+id/global_screenshot_actions_container"

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center"

        android:layout_gravity="bottom|left"

        android:elevation="3dp"

        android:elevation="1dp"

        android:fillViewport="true"

        android:fillViewport="true"

        android:layout_marginHorizontal="@dimen/screenshot_action_container_margin_horizontal"

        android:layout_marginHorizontal="@dimen/screenshot_action_container_margin_horizontal"

        android:gravity="center"

        android:gravity="center"
@@ -63,7 +63,7 @@ 
        android:id="@+id/global_screenshot_dismiss_button"

        android:id="@+id/global_screenshot_dismiss_button"

        android:layout_width="@dimen/screenshot_dismiss_button_tappable_size"

        android:layout_width="@dimen/screenshot_dismiss_button_tappable_size"

        android:layout_height="@dimen/screenshot_dismiss_button_tappable_size"

        android:layout_height="@dimen/screenshot_dismiss_button_tappable_size"

        android:elevation="9dp"

        android:elevation="7dp"

        android:visibility="gone">

        android:visibility="gone">

        <ImageView

        <ImageView

            android:layout_width="match_parent"

            android:layout_width="match_parent"
@@ -76,7 +76,7 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:src="@android:color/white"

        android:src="@android:color/white"

        android:elevation="8dp"

        android:elevation="@dimen/screenshot_preview_elevation"

        android:visibility="gone"/>

        android:visibility="gone"/>

    <com.android.systemui.screenshot.ScreenshotSelectorView

    <com.android.systemui.screenshot.ScreenshotSelectorView

        android:id="@+id/global_screenshot_selector"

        android:id="@+id/global_screenshot_selector"

packages/SystemUI/res/layout/global_screenshot_action_chip.xml

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

              android:id="@+id/global_screenshot_action_chip"

              android:layout_width="wrap_content"

              android:layout_width="wrap_content"

              android:layout_height="wrap_content"

              android:layout_height="wrap_content"

              android:layout_marginHorizontal="@dimen/screenshot_action_chip_margin_horizontal"

              android:layout_marginRight="@dimen/screenshot_action_chip_margin_right"

              android:layout_gravity="center"

              android:layout_gravity="center"

              android:paddingVertical="@dimen/screenshot_action_chip_padding_vertical"

              android:paddingVertical="@dimen/screenshot_action_chip_padding_vertical"

              android:background="@drawable/action_chip_background"

              android:background="@drawable/action_chip_background"
@@ -35,7 +35,7 @@ 
        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/screenshot_action_chip_padding_end"

        android:layout_marginEnd="@dimen/screenshot_action_chip_padding_end"

        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

        android:textSize="@dimen/screenshot_action_chip_text_size"

        android:textSize="@dimen/screenshot_action_chip_text_size"

        android:textStyle="bold"

        android:textColor="@color/global_screenshot_button_text"/>

        android:textColor="@color/global_screenshot_button_text"/>

</com.android.systemui.screenshot.ScreenshotActionChip>
 
</com.android.systemui.screenshot.ScreenshotActionChip>

packages/SystemUI/res/values/dimens.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -305,7 +305,7 @@ 
    <dimen name="global_screenshot_legacy_bg_padding">20dp</dimen>

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

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

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

    <dimen name="global_screenshot_x_scale">80dp</dimen>

    <dimen name="global_screenshot_x_scale">80dp</dimen>

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

    <dimen name="screenshot_preview_elevation">6dp</dimen>

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

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

    <dimen name="screenshot_offset_x">16dp</dimen>

    <dimen name="screenshot_offset_x">16dp</dimen>

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

    <dimen name="screenshot_dismiss_button_tappable_size">48dp</dimen>
@@ -314,13 +314,13 @@ 
    <dimen name="screenshot_action_container_corner_radius">10dp</dimen>

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

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

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

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

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

    <dimen name="screenshot_action_container_padding_left">100dp</dimen>

    <dimen name="screenshot_action_container_padding_left">96dp</dimen>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <!-- Padding between icon and text -->

    <!-- Padding between icon and text -->

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

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