Merge "Apply styling to grid options, header" into sc-dev
diff --git a/res/color/option_title_color.xml b/res/color/option_title_color.xml
index 2809247..6166f4d 100644
--- a/res/color/option_title_color.xml
+++ b/res/color/option_title_color.xml
@@ -17,11 +17,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="true"
- android:color="?android:colorAccent" />
+ android:color="?android:textColorPrimary" />
<item
android:state_activated="false"
- android:alpha="0.54"
- android:color="?android:colorForeground" />
+ android:color="?android:textColorTertiary" />
<item
- android:color="?android:colorForeground"/>
+ android:color="?android:textColorTertiary"/>
</selector>
diff --git a/res/drawable/option_border.xml b/res/drawable/option_border.xml
index ff03ed0..be9e4b2 100644
--- a/res/drawable/option_border.xml
+++ b/res/drawable/option_border.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:color="?android:attr/colorControlHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
@@ -21,5 +22,10 @@
<corners android:radius="?android:dialogCornerRadius" />
</shape>
</item>
- <item android:drawable="@drawable/option_border_edge" />
+ <item>
+ <shape android:shape="rectangle">
+ <solid android:color="?androidprv:attr/colorSurface"/>
+ <corners android:radius="?android:dialogCornerRadius" />
+ </shape>
+ </item>
</ripple>
diff --git a/res/layout/section_header.xml b/res/layout/section_header.xml
index 6010f60..9bbce39 100644
--- a/res/layout/section_header.xml
+++ b/res/layout/section_header.xml
@@ -15,11 +15,11 @@
limitations under the License.
-->
-<com.google.android.material.appbar.AppBarLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:elevation="8dp">
+ app:elevation="0dp">
<Toolbar
android:id="@+id/toolbar"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bb59056..fd8a2e4 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -195,8 +195,8 @@
<dimen name="indicator_arrow_container_margin_horizontal">4dp</dimen>
<dimen name="preview_page_gap">16dp</dimen>
<dimen name="preview_page_horizontal_margin">56dp</dimen>
- <dimen name="preview_page_top_margin">30dp</dimen>
- <dimen name="preview_page_bottom_margin">2dp</dimen>
+ <dimen name="preview_page_top_margin">24dp</dimen>
+ <dimen name="preview_page_bottom_margin">24dp</dimen>
<dimen name="preview_card_padding">20dp</dimen>
<dimen name="preview_pager_max_height">450dp</dimen>
<dimen name="preview_pager_min_height">350dp</dimen>
@@ -227,8 +227,8 @@
<dimen name="option_border_width">2dp</dimen>
<dimen name="option_selected_border_width">3dp</dimen>
- <dimen name="option_title_font_text_size">12sp</dimen>
- <dimen name="option_title_line_height">16dp</dimen>
+ <dimen name="option_title_font_text_size">14sp</dimen>
+ <dimen name="option_title_line_height">20dp</dimen>
<!-- The size of lock screen widget on the full screen. -->
<dimen name="lock_screen_preview_lock_icon_size">42dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5c48aa8..02cdc11 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -222,13 +222,11 @@
<item name="cardCornerRadius">?android:dialogCornerRadius</item>
<item name="android:clipChildren">true</item>
<item name="contentPadding">@dimen/preview_card_padding</item>
- <item name="cardBackgroundColor">?android:colorPrimary</item>
</style>
<style name="FullContentPreviewCard" parent="PreviewCard">
<item name="android:clipChildren">true</item>
<item name="contentPadding">0dp</item>
- <item name="cardBackgroundColor">?android:colorPrimary</item>
</style>
<!-- Bottom action item -->