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

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

Merge "Increase screenshot button tap targets to 48dp" into rvc-dev am: ec4e1edb

Change-Id: I41a7fff4eacd29874f06eefdbbb0fead6f777688
parents d0a85b71 ec4e1edb
Loading
Loading
Loading
Loading
+22 −16
Original line number Diff line number Diff line
@@ -20,10 +20,15 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_marginEnd="@dimen/screenshot_action_chip_margin_right"
    android:paddingVertical="@dimen/screenshot_action_chip_margin_vertical"
    android:layout_gravity="center"
    android:gravity="center"
    android:alpha="0.0">
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingVertical="@dimen/screenshot_action_chip_padding_vertical"
        android:background="@drawable/action_chip_background"
    android:alpha="0.0"
        android:gravity="center">
        <ImageView
            android:id="@+id/screenshot_action_chip_icon"
@@ -39,4 +44,5 @@
            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
            android:textSize="@dimen/screenshot_action_chip_text_size"
            android:textColor="@color/global_screenshot_button_text"/>
    </LinearLayout>
</com.android.systemui.screenshot.ScreenshotActionChip>
+2 −1
Original line number Diff line number Diff line
@@ -314,13 +314,14 @@
    <dimen name="screenshot_dismiss_button_margin">8dp</dimen>
    <dimen name="screenshot_action_container_offset_y">32dp</dimen>
    <dimen name="screenshot_action_container_corner_radius">10dp</dimen>
    <dimen name="screenshot_action_container_padding_vertical">16dp</dimen>
    <dimen name="screenshot_action_container_padding_vertical">6dp</dimen>
    <dimen name="screenshot_action_container_margin_horizontal">8dp</dimen>
    <dimen name="screenshot_action_container_padding_left">96dp</dimen>
    <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_vertical">10dp</dimen>
    <dimen name="screenshot_action_chip_padding_vertical">7dp</dimen>
    <dimen name="screenshot_action_chip_icon_size">18dp</dimen>
    <dimen name="screenshot_action_chip_padding_start">8dp</dimen>
+0 −2
Original line number Diff line number Diff line
@@ -703,9 +703,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
                mScreenshotPreview.buildLayer();
                mScreenshotAnimation.start();
            });

        });

    }

    private AnimatorSet createScreenshotDropInAnimation(int width, int height, Rect bounds) {
+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import android.content.Context;
import android.graphics.drawable.Icon;
import android.util.AttributeSet;
import android.util.Log;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;

import com.android.systemui.R;
@@ -31,7 +31,7 @@ import com.android.systemui.R;
/**
 * View for a chip with an icon and text.
 */
public class ScreenshotActionChip extends LinearLayout {
public class ScreenshotActionChip extends FrameLayout {

    private static final String TAG = "ScreenshotActionChip";