Merge "Adjusts measurement for magnification switch and drag handle" into sc-dev

This commit is contained in:
Minche Li
2021-05-13 02:38:33 +00:00
committed by Android (Google) Code Review
6 changed files with 15 additions and 12 deletions

View File

@@ -19,7 +19,7 @@
<item>
<shape android:shape="rectangle">
<solid
android:color="@color/magnification_switch_button_color" />
android:color="@color/magnification_drag_handle_color" />
<size
android:height="@dimen/magnification_drag_view_size"
android:width="@dimen/magnification_drag_view_size"/>
@@ -28,8 +28,8 @@
<item
android:gravity="center">
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="30dp"
android:height="30dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path

View File

@@ -24,10 +24,11 @@
</shape>
</item>
<item>
<item
android:gravity="center">
<vector
android:width="24dp"
android:height="24dp"
android:width="36dp"
android:height="36dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>

View File

@@ -24,10 +24,11 @@
</shape>
</item>
<item>
<item
android:gravity="center">
<vector
android:width="24dp"
android:height="24dp"
android:width="36dp"
android:height="36dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path

View File

@@ -75,7 +75,7 @@
android:id="@+id/drag_handle"
android:layout_width="@dimen/magnification_drag_view_size"
android:layout_height="@dimen/magnification_drag_view_size"
android:layout_margin="@dimen/magnification_outer_border_margin"
android:layout_margin="@dimen/magnification_inner_border_margin"
android:layout_gravity="right|bottom"
android:paddingEnd="@dimen/magnifier_drag_handle_padding"
android:paddingBottom="@dimen/magnifier_drag_handle_padding"

View File

@@ -247,6 +247,7 @@
<!-- Window magnification colors -->
<color name="magnification_border_color">#FF9900</color>
<color name="magnification_switch_button_color">#7F000000</color>
<color name="magnification_drag_handle_color">#B3000000</color>
<!-- Volume dialog colors -->
<color name="volume_dialog_background_color">@android:color/transparent</color>

View File

@@ -1290,9 +1290,9 @@
<dimen name="magnification_mirror_surface_margin">20dp</dimen>
<dimen name="magnification_frame_move_short">5dp</dimen>
<dimen name="magnification_frame_move_long">25dp</dimen>
<dimen name="magnification_drag_view_size">38dp</dimen>
<dimen name="magnification_drag_view_size">36dp</dimen>
<dimen name="magnification_controls_size">90dp</dimen>
<dimen name="magnification_switch_button_size">60dp</dimen>
<dimen name="magnification_switch_button_size">48dp</dimen>
<dimen name="magnification_switch_button_padding">6dp</dimen>
<dimen name="magnifier_left_right_controls_width">35dp</dimen>
<dimen name="magnifier_left_right_controls_height">45dp</dimen>