Skip to content

Commit 8392cf9

Browse files
committed
fix narrow settings cards background warping on high api
1 parent 2b54947 commit 8392cf9

15 files changed

+15
-14
lines changed

features/feature_settings/src/main/res/layout/item_settings_checkbox.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_checkbox_with_range.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_collapse.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_hint.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="20"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_range.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_selector.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_selector_with_button.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_spinner.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_spinner_even.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_spinner_not_checkable.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_spinner_with_button.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_text.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_text_with_button.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/layout/item_settings_translator.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
style="@style/SettingsCard"
1010
android:layout_width="match_parent"
1111
android:layout_height="0dp"
12-
android:scaleY="2.5"
12+
android:scaleY="@integer/settings_card_scale"
1313
app:layout_constraintBottom_toBottomOf="parent"
1414
app:layout_constraintTop_toTopOf="parent" />
1515

features/feature_settings/src/main/res/values/dimens.xml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<dimen name="settings_background_height">14dp</dimen>
44
<dimen name="settings_background_bottom_shift">-14dp</dimen>
55
<dimen name="settings_background_height_double">28dp</dimen>
6+
<integer name="settings_card_scale">5</integer>
67
<!-- One dp bigger than background card elevation -->
78
<dimen name="settings_card_elevation">5dp</dimen>
89
</resources>

0 commit comments

Comments
 (0)