Skip to content

Commit c08c835

Browse files
committed
Revert "BottomSheet: Use primary container color"
This reverts commit 4a44a44.
1 parent 04eef92 commit c08c835

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

app/src/main/res/drawable/rp_preference_down_bg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<item android:id="@android:id/background">
55
<shape
66
android:shape="rectangle"
7-
android:tint="?attr/colorPrimaryContainer">
7+
android:tint="?attr/colorSurfaceContainer">
88
<corners android:topLeftRadius="4dp"
99
android:topRightRadius="4dp"
1010
android:bottomRightRadius="28dp"

app/src/main/res/drawable/rp_preference_mid_bg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<item android:id="@android:id/background">
55
<shape
66
android:shape="rectangle"
7-
android:tint="?attr/colorPrimaryContainer">
7+
android:tint="?attr/colorSurfaceContainer">
88
<corners android:topLeftRadius="4dp"
99
android:topRightRadius="4dp"
1010
android:bottomRightRadius="4dp"

app/src/main/res/drawable/rp_preference_single_bg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<item android:id="@android:id/background">
55
<shape
66
android:shape="rectangle"
7-
android:tint="?attr/colorPrimaryContainer">
7+
android:tint="?attr/colorSurfaceContainer">
88
<corners android:radius="28dp" />
99
</shape>
1010
</item>

app/src/main/res/drawable/rp_preference_up_bg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<item android:id="@android:id/background">
55
<shape
66
android:shape="rectangle"
7-
android:tint="?attr/colorPrimaryContainer">
7+
android:tint="?attr/colorSurfaceContainer">
88
<corners android:topLeftRadius="28dp"
99
android:topRightRadius="28dp"
1010
android:bottomRightRadius="4dp"

app/src/main/res/layout/preference_down_settings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
android:layout_height="18dp"
1818
android:src="@drawable/settings_art"
1919
android:layout_gravity="center_vertical"
20-
app:tint="?attr/colorOnPrimaryContainer"/>
20+
app:tint="?attr/colorOnSurface"/>
2121

2222
<TextView
2323
android:layout_gravity="center_vertical"
2424
android:layout_marginStart="58dp"
2525
android:layout_marginEnd="48dp"
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
28-
android:textColor="?attr/colorOnPrimaryContainer"
28+
android:textColor="?attr/colorOnSurface"
2929
android:textSize="16sp"
3030
android:text="@string/home_menu_settings"
3131
style="@style/HeadlineTextAppearance" />
@@ -35,7 +35,7 @@
3535
android:layout_height="18dp"
3636
android:layout_marginEnd="22dp"
3737
android:layout_gravity="center_vertical|end"
38-
app:tint="?attr/colorOnPrimaryContainer"
38+
app:tint="?attr/colorOnSurface"
3939
android:src="@drawable/ic_chevron_right" />
4040

4141
</FrameLayout>

app/src/main/res/layout/preference_down_shuffle.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
android:layout_height="18dp"
1818
android:src="@drawable/ic_shuffle"
1919
android:layout_gravity="center_vertical"
20-
app:tint="?attr/colorOnPrimaryContainer"/>
20+
app:tint="?attr/colorOnSurface"/>
2121

2222
<TextView
2323
android:layout_gravity="center_vertical"
2424
android:layout_marginStart="58dp"
2525
android:layout_marginEnd="48dp"
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
28-
android:textColor="?attr/colorOnPrimaryContainer"
28+
android:textColor="?attr/colorOnSurface"
2929
android:textSize="16sp"
3030
android:text="@string/home_menu_shuffle"
3131
style="@style/HeadlineTextAppearance" />
@@ -35,7 +35,7 @@
3535
android:layout_height="18dp"
3636
android:layout_marginEnd="22dp"
3737
android:layout_gravity="center_vertical|end"
38-
app:tint="?attr/colorOnPrimaryContainer"
38+
app:tint="?attr/colorOnSurface"
3939
android:src="@drawable/ic_chevron_right" />
4040

4141
</FrameLayout>

app/src/main/res/layout/preference_up_refresh.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
android:layout_height="18dp"
1818
android:src="@drawable/ic_refresh"
1919
android:layout_gravity="center_vertical"
20-
app:tint="?attr/colorOnPrimaryContainer"/>
20+
app:tint="?attr/colorOnSurface"/>
2121

2222
<TextView
2323
android:layout_gravity="center_vertical"
2424
android:layout_marginStart="58dp"
2525
android:layout_marginEnd="48dp"
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
28-
android:textColor="?attr/colorOnPrimaryContainer"
28+
android:textColor="?attr/colorOnSurface"
2929
android:textSize="16sp"
3030
android:text="@string/home_menu_refresh"
3131
style="@style/HeadlineTextAppearance" />
@@ -35,7 +35,7 @@
3535
android:layout_height="18dp"
3636
android:layout_marginEnd="22dp"
3737
android:layout_gravity="center_vertical|end"
38-
app:tint="?attr/colorOnPrimaryContainer"
38+
app:tint="?attr/colorOnSurface"
3939
android:src="@drawable/ic_chevron_right" />
4040

4141
</FrameLayout>

app/src/main/res/layout/preference_up_search.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
android:layout_height="18dp"
1818
android:src="@drawable/ic_search"
1919
android:layout_gravity="center_vertical"
20-
app:tint="?attr/colorOnPrimaryContainer"/>
20+
app:tint="?attr/colorOnSurface"/>
2121

2222
<TextView
2323
android:layout_gravity="center_vertical"
2424
android:layout_marginStart="58dp"
2525
android:layout_marginEnd="48dp"
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
28-
android:textColor="?attr/colorOnPrimaryContainer"
28+
android:textColor="?attr/colorOnSurface"
2929
android:textSize="16sp"
3030
android:text="@string/home_menu_search"
3131
style="@style/HeadlineTextAppearance" />
@@ -35,7 +35,7 @@
3535
android:layout_height="18dp"
3636
android:layout_marginEnd="22dp"
3737
android:layout_gravity="center_vertical|end"
38-
app:tint="?attr/colorOnPrimaryContainer"
38+
app:tint="?attr/colorOnSurface"
3939
android:src="@drawable/ic_chevron_right" />
4040

4141
</FrameLayout>

0 commit comments

Comments
 (0)