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

Merge changes I737c4091,I89e88479 into sc-dev

Browse Source 
* changes:
  Fix screenshot preview border radii
  Fix screenshot preview border in RTL
This commit is contained in:
Miranda Kephart
2021-06-11 17:55:20 +00:00
committed by Android (Google) Code Review
parent b05527a04f b99d9af1dc
commit dcac024cfe
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/drawable/screenshot_border.xml
View File

@@ -19,5 +19,5 @@
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="?androidprv:attr/colorSurface"/> <solid android:color="?androidprv:attr/colorSurface"/>
<corners android:radius="20dp"/> <corners android:radius="24dp"/>
</shape> </shape>

9
packages/SystemUI/res/layout/global_screenshot_static.xml
View File

@@ -71,7 +71,7 @@
android:background="@drawable/screenshot_border" android:background="@drawable/screenshot_border"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/screenshot_preview_end" app:layout_constraintEnd_toEndOf="@+id/screenshot_preview_end"
app:layout_constraintTop_toTopOf="@+id/screenshot_preview_top"/> app:layout_constraintTop_toTopOf="@+id/screenshot_preview_top"/>
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/screenshot_preview_end" android:id="@+id/screenshot_preview_end"
@@ -91,8 +91,7 @@
android:id="@+id/global_screenshot_preview" android:id="@+id/global_screenshot_preview"
android:visibility="invisible" android:visibility="invisible"
android:layout_width="@dimen/global_screenshot_x_scale" android:layout_width="@dimen/global_screenshot_x_scale"
android:layout_marginStart="4dp" android:layout_margin="4dp"
android:layout_marginBottom="4dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:elevation="@dimen/screenshot_preview_elevation" android:elevation="@dimen/screenshot_preview_elevation"
@@ -101,7 +100,9 @@
android:background="@drawable/screenshot_preview_background" android:background="@drawable/screenshot_preview_background"
android:adjustViewBounds="true" android:adjustViewBounds="true"
app:layout_constraintBottom_toBottomOf="@+id/global_screenshot_preview_border" app:layout_constraintBottom_toBottomOf="@+id/global_screenshot_preview_border"
app:layout_constraintStart_toStartOf="@+id/global_screenshot_preview_border"> app:layout_constraintStart_toStartOf="@+id/global_screenshot_preview_border"
app:layout_constraintEnd_toEndOf="@+id/global_screenshot_preview_border"
app:layout_constraintTop_toTopOf="@+id/global_screenshot_preview_border">
</ImageView> </ImageView>
<FrameLayout <FrameLayout
android:id="@+id/global_screenshot_dismiss_button" android:id="@+id/global_screenshot_dismiss_button"