Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: If09fdb84b7efa7aea040502dff0d0a08d8030ea5
This commit is contained in:
Miranda Kephart
2020-05-19 14:01:30 +00:00
committed by Automerger Merge Worker
parent 8dbbb793db ec4e1edb6d
commit 8b29ab64f8
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/SystemUI/res/layout/global_screenshot_action_chip.xml
View File

@@ -20,23 +20,29 @@
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_margin_right" android:layout_marginEnd="@dimen/screenshot_action_chip_margin_right"
android:paddingVertical="@dimen/screenshot_action_chip_margin_vertical"
android:layout_gravity="center" android:layout_gravity="center"
android:paddingVertical="@dimen/screenshot_action_chip_padding_vertical" android:gravity="center"
android:background="@drawable/action_chip_background" android:alpha="0.0">
android:alpha="0.0" <LinearLayout
android:gravity="center">
<ImageView
android:id="@+id/screenshot_action_chip_icon"
android:layout_width="@dimen/screenshot_action_chip_icon_size"
android:layout_height="@dimen/screenshot_action_chip_icon_size"
android:layout_marginStart="@dimen/screenshot_action_chip_padding_start"
android:layout_marginEnd="@dimen/screenshot_action_chip_padding_middle"/>
<TextView
android:id="@+id/screenshot_action_chip_text"
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:paddingVertical="@dimen/screenshot_action_chip_padding_vertical"
android:fontFamily="@*android:string/config_headlineFontFamilyMedium" android:background="@drawable/action_chip_background"
android:textSize="@dimen/screenshot_action_chip_text_size" android:gravity="center">
android:textColor="@color/global_screenshot_button_text"/> <ImageView
android:id="@+id/screenshot_action_chip_icon"
android:layout_width="@dimen/screenshot_action_chip_icon_size"
android:layout_height="@dimen/screenshot_action_chip_icon_size"
android:layout_marginStart="@dimen/screenshot_action_chip_padding_start"
android:layout_marginEnd="@dimen/screenshot_action_chip_padding_middle"/>
<TextView
android:id="@+id/screenshot_action_chip_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/screenshot_action_chip_padding_end"
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> </com.android.systemui.screenshot.ScreenshotActionChip>

3
packages/SystemUI/res/values/dimens.xml
View File

@@ -314,13 +314,14 @@
<dimen name="screenshot_dismiss_button_margin">8dp</dimen> <dimen name="screenshot_dismiss_button_margin">8dp</dimen>
<dimen name="screenshot_action_container_offset_y">32dp</dimen> <dimen name="screenshot_action_container_offset_y">32dp</dimen>
<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">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_margin_horizontal">8dp</dimen>
<dimen name="screenshot_action_container_padding_left">96dp</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_right">8dp</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_padding_vertical">7dp</dimen>
<dimen name="screenshot_action_chip_icon_size">18dp</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>

2
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -703,9 +703,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
mScreenshotPreview.buildLayer(); mScreenshotPreview.buildLayer();
mScreenshotAnimation.start(); mScreenshotAnimation.start();
}); });
}); });
} }
private AnimatorSet createScreenshotDropInAnimation(int width, int height, Rect bounds) { private AnimatorSet createScreenshotDropInAnimation(int width, int height, Rect bounds) {

4
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java
View File

@@ -22,8 +22,8 @@ import android.content.Context;
import android.graphics.drawable.Icon; import android.graphics.drawable.Icon;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.android.systemui.R; import com.android.systemui.R;
@@ -31,7 +31,7 @@ import com.android.systemui.R;
/** /**
* View for a chip with an icon and text. * 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"; private static final String TAG = "ScreenshotActionChip";