Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47d4bc0e authored by Noah Wang's avatar Noah Wang Committed by android-build-merger
Browse files

Merge "Maintain higher color contrast of labels/controlls on the side of the... 

Merge "Maintain higher color contrast of labels/controlls on the side of the SeekBar in PreviewPagerPreferenceFragment Bug: 27952877" into nyc-dev am: 40c2e7ad
am: d7c1b42a

* commit 'd7c1b42a':
  Maintain higher color contrast of labels/controlls on the side of the SeekBar in PreviewPagerPreferenceFragment Bug: 27952877

Change-Id: I8eb58d97e2aae7becacf2b0117be37cc66b93683
parents dd434719 d7c1b42a

res/layout/font_size_activity.xml

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_font_size_16dp"

                    android:tint="?android:attr/colorControlNormal"

                    android:tint="?android:attr/textColorPrimary"

                    android:tintMode="src_in"

                    android:scaleType="center"

                    android:focusable="true"
@@ -82,7 +82,7 @@ 
                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_font_size_24dp"

                    android:tint="?android:attr/colorControlNormal"

                    android:tint="?android:attr/textColorPrimary"

                    android:tintMode="src_in"

                    android:scaleType="center"

                    android:focusable="true"

res/layout/screen_zoom_activity.xml

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_remove_24dp"

                    android:tint="?android:attr/colorControlNormal"

                    android:tint="?android:attr/textColorPrimary"

                    android:tintMode="src_in"

                    android:scaleType="center"

                    android:focusable="true"
@@ -81,7 +81,7 @@ 
                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_add_24dp"

                    android:tint="?android:attr/colorControlNormal"

                    android:tint="?android:attr/textColorPrimary"

                    android:tintMode="src_in"

                    android:scaleType="center"

                    android:focusable="true"