Cursor colour Settings VisD update

Fixes: 400303794
Flag: NONE bug fix
Test: screenshot in comment
Change-Id: Ic9ddce25627c021f46de301af5e2fd22a74719e0
This commit is contained in:
yyalan
2025-03-06 17:06:03 +00:00
parent 3307af4985
commit 3e62540560
3 changed files with 26 additions and 44 deletions

View File

@@ -38,22 +38,14 @@
<LinearLayout <LinearLayout
android:id="@+id/button_holder" android:id="@+id/button_holder"
android:layout_width="@dimen/pointer_fill_container_max_width" android:layout_width="wrap_content"
android:layout_height="@dimen/pointer_fill_container_height" android:layout_height="@dimen/pointer_fill_container_height"
android:layout_marginBottom="@dimen/pointer_fill_style_circle_padding" android:layout_marginBottom="@dimen/pointer_fill_style_circle_padding"
android:layout_marginTop="@dimen/pointer_fill_style_circle_padding" android:layout_marginTop="@dimen/pointer_fill_style_circle_padding"
android:gravity="center" android:gravity="left|center_vertical"
android:paddingTop="@dimen/pointer_fill_style_container_padding" android:paddingTop="@dimen/pointer_fill_style_container_padding"
android:paddingBottom="@dimen/pointer_fill_style_container_padding"> android:paddingBottom="@dimen/pointer_fill_style_container_padding">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:focusable="false"
android:clickable="false"
android:importantForAccessibility="no"
android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/button_black" android:id="@+id/button_black"
android:layout_width="@dimen/pointer_fill_style_circle_background_outer_diameter" android:layout_width="@dimen/pointer_fill_style_circle_background_outer_diameter"
@@ -66,12 +58,11 @@
android:src="@drawable/pointer_icon_fill_color_background" /> android:src="@drawable/pointer_icon_fill_color_background" />
<View <View
android:layout_width="0dp" android:layout_width="@dimen/pointer_fill_style_circle_spacer"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusable="false" android:focusable="false"
android:clickable="false" android:clickable="false"
android:importantForAccessibility="no" android:importantForAccessibility="no"/>
android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/button_green" android:id="@+id/button_green"
@@ -85,12 +76,11 @@
android:src="@drawable/pointer_icon_fill_color_background" /> android:src="@drawable/pointer_icon_fill_color_background" />
<View <View
android:layout_width="0dp" android:layout_width="@dimen/pointer_fill_style_circle_spacer"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusable="false" android:focusable="false"
android:clickable="false" android:clickable="false"
android:importantForAccessibility="no" android:importantForAccessibility="no"/>
android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/button_red" android:id="@+id/button_red"
@@ -104,12 +94,11 @@
android:src="@drawable/pointer_icon_fill_color_background" /> android:src="@drawable/pointer_icon_fill_color_background" />
<View <View
android:layout_width="0dp" android:layout_width="@dimen/pointer_fill_style_circle_spacer"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusable="false" android:focusable="false"
android:clickable="false" android:clickable="false"
android:importantForAccessibility="no" android:importantForAccessibility="no"/>
android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/button_pink" android:id="@+id/button_pink"
@@ -123,12 +112,11 @@
android:src="@drawable/pointer_icon_fill_color_background" /> android:src="@drawable/pointer_icon_fill_color_background" />
<View <View
android:layout_width="0dp" android:layout_width="@dimen/pointer_fill_style_circle_spacer"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusable="false" android:focusable="false"
android:clickable="false" android:clickable="false"
android:importantForAccessibility="no" android:importantForAccessibility="no"/>
android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/button_blue" android:id="@+id/button_blue"
@@ -142,12 +130,11 @@
android:src="@drawable/pointer_icon_fill_color_background" /> android:src="@drawable/pointer_icon_fill_color_background" />
<View <View
android:layout_width="0dp" android:layout_width="@dimen/pointer_fill_style_circle_spacer"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusable="false" android:focusable="false"
android:clickable="false" android:clickable="false"
android:importantForAccessibility="no" android:importantForAccessibility="no"/>
android:layout_weight="1" />
<ImageView <ImageView
android:id="@+id/button_purple" android:id="@+id/button_purple"
@@ -160,13 +147,6 @@
android:scaleType="center" android:scaleType="center"
android:src="@drawable/pointer_icon_fill_color_background" /> android:src="@drawable/pointer_icon_fill_color_background" />
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:focusable="false"
android:clickable="false"
android:importantForAccessibility="no"
android:layout_weight="1" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@@ -33,4 +33,5 @@
<dimen name="pointer_fill_container_height">104dp</dimen> <dimen name="pointer_fill_container_height">104dp</dimen>
<dimen name="pointer_fill_container_max_width">448dp</dimen> <dimen name="pointer_fill_container_max_width">448dp</dimen>
<dimen name="pointer_fill_style_container_padding">32dp</dimen> <dimen name="pointer_fill_style_container_padding">32dp</dimen>
<dimen name="pointer_fill_style_circle_spacer">12dp</dimen>
</resources> </resources>

View File

@@ -188,25 +188,26 @@
<!-- Pointer --> <!-- Pointer -->
<dimen name="pointer_fill_container_height">80dp</dimen> <dimen name="pointer_fill_container_height">80dp</dimen>
<dimen name="pointer_fill_container_max_width">468dp</dimen> <dimen name="pointer_fill_container_max_width">344dp</dimen>
<dimen name="pointer_fill_style_container_padding">32dp</dimen> <dimen name="pointer_fill_style_container_padding">22dp</dimen>
<dimen name="pointer_fill_style_target_width">64dp</dimen> <dimen name="pointer_fill_style_target_width">54dp</dimen>
<dimen name="pointer_fill_style_circle_diameter">39dp</dimen> <dimen name="pointer_fill_style_circle_diameter">34dp</dimen>
<dimen name="pointer_fill_style_circle_outline_diameter">39.5dp</dimen> <dimen name="pointer_fill_style_circle_outline_diameter">34.5dp</dimen>
<dimen name="pointer_fill_style_circle_background_corner_radius">20dp</dimen> <dimen name="pointer_fill_style_circle_background_corner_radius">20dp</dimen>
<dimen name="pointer_fill_style_circle_background_corner_inner_radius">16dp</dimen> <dimen name="pointer_fill_style_circle_background_corner_inner_radius">16dp</dimen>
<dimen name="pointer_fill_style_circle_background_outer_diameter">64dp</dimen> <dimen name="pointer_fill_style_circle_background_outer_diameter">54dp</dimen>
<dimen name="pointer_fill_style_circle_background_outer_diameter_less_stroke">62dp</dimen> <dimen name="pointer_fill_style_circle_background_outer_diameter_less_stroke">52dp</dimen>
<dimen name="pointer_fill_style_circle_background_outer_diameter_selected">52dp</dimen> <dimen name="pointer_fill_style_circle_background_outer_diameter_selected">42dp</dimen>
<dimen name="pointer_fill_style_circle_background_outline_offset">1dp</dimen> <dimen name="pointer_fill_style_circle_background_outline_offset">1dp</dimen>
<dimen name="pointer_fill_style_circle_offset">12.5dp</dimen> <dimen name="pointer_fill_style_circle_offset">8.5dp</dimen>
<dimen name="pointer_fill_style_circle_offset_selected">13.25dp</dimen> <dimen name="pointer_fill_style_circle_offset_selected">9.25dp</dimen>
<dimen name="pointer_fill_style_circle_outline_offset">12.25dp</dimen> <dimen name="pointer_fill_style_circle_outline_offset">8.25dp</dimen>
<dimen name="pointer_fill_style_circle_outline_offset_selected">13dp</dimen> <dimen name="pointer_fill_style_circle_outline_offset_selected">9dp</dimen>
<dimen name="pointer_fill_style_circle_background_offset">7dp</dimen> <dimen name="pointer_fill_style_circle_background_offset">7dp</dimen>
<dimen name="pointer_fill_style_circle_outline_stroke">1dp</dimen> <dimen name="pointer_fill_style_circle_outline_stroke">1dp</dimen>
<dimen name="pointer_fill_style_circle_background_selected_outline_stroke">2dp</dimen> <dimen name="pointer_fill_style_circle_background_selected_outline_stroke">2dp</dimen>
<dimen name="pointer_fill_style_circle_padding">16dp</dimen> <dimen name="pointer_fill_style_circle_padding">16dp</dimen>
<dimen name="pointer_fill_style_circle_spacer">6dp</dimen>
<dimen name="pointer_fill_style_checkmark_selected_padding">16dp</dimen> <dimen name="pointer_fill_style_checkmark_selected_padding">16dp</dimen>
<dimen name="pointer_fill_style_checkmark_size">24dp</dimen> <dimen name="pointer_fill_style_checkmark_size">24dp</dimen>
<dimen name="pointer_stroke_style_padding">8dp</dimen> <dimen name="pointer_stroke_style_padding">8dp</dimen>