diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-30 23:19:48 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-30 23:19:48 +0000 |
| commit | 1eeaa0ca6282a19fe5edd1f7e3034ca2b69e68c8 (patch) | |
| tree | b57bcbe25154132732de5ce67655f765fed1db9b | |
| parent | de3a983264e56fd1e99a28cfff1efb4a48b68161 (diff) | |
| parent | 8c4279590c70cae8ee9c48f87fbf62a210eb05b9 (diff) | |
| download | android_packages_wallpapers_LivePicker-1eeaa0ca6282a19fe5edd1f7e3034ca2b69e68c8.tar.gz android_packages_wallpapers_LivePicker-1eeaa0ca6282a19fe5edd1f7e3034ca2b69e68c8.tar.bz2 android_packages_wallpapers_LivePicker-1eeaa0ca6282a19fe5edd1f7e3034ca2b69e68c8.zip | |
Snap for 5422062 from 8c4279590c70cae8ee9c48f87fbf62a210eb05b9 to qt-release
Change-Id: I2cf1390a6966b51749aaa63cc9bee65e62c259ad
| -rw-r--r-- | res/layout/page_info.xml | 2 | ||||
| -rw-r--r-- | res/layout/page_settings.xml | 2 | ||||
| -rw-r--r-- | res/values/dimensions.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 7 |
4 files changed, 4 insertions, 11 deletions
diff --git a/res/layout/page_info.xml b/res/layout/page_info.xml index 001b110..7187b56 100644 --- a/res/layout/page_info.xml +++ b/res/layout/page_info.xml @@ -77,7 +77,7 @@ android:id="@+id/preview_attribution_pane_set_wallpaper_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/UnelevatedButtonStyle" + style="@style/ButtonStyle" android:text="@string/set_live_wallpaper"/> </LinearLayout> diff --git a/res/layout/page_settings.xml b/res/layout/page_settings.xml index f5d0b89..25b4aec 100644 --- a/res/layout/page_settings.xml +++ b/res/layout/page_settings.xml @@ -28,7 +28,7 @@ android:id="@+id/preview_attribution_pane_set_wallpaper_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/UnelevatedButtonStyle" + style="@style/ButtonStyle" android:text="@string/set_live_wallpaper"/> </LinearLayout> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 2d01a68..5066ca3 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -41,8 +41,4 @@ <!-- Dimensions for the ConstraintViewPager on preview activity. --> <dimen name="preview_viewpager_round_radius">12dp</dimen> - - <!-- Dimensions for the button. --> - <dimen name="btn_corner_radius">4dp</dimen> - <dimen name="btn_outlined_stroke">1dp</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 26d8511..7e41b5e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -33,9 +33,8 @@ <item name="android:colorAccent">@*android:color/accent_device_default_light</item> <item name="colorAccent">@*android:color/accent_device_default_light</item> + <item name="colorPrimary">@*android:color/accent_device_default_light</item> <item name="colorOnPrimary">@*android:color/primary_device_default_light</item> - - <item name="android:buttonCornerRadius">@dimen/btn_corner_radius</item> </style> <style name="TranslucentToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> @@ -56,12 +55,10 @@ <style name="AlertDialogStyle" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"/> - <style name="UnelevatedButtonStyle" parent="@android:style/Widget.DeviceDefault.Button.Colored"> + <style name="ButtonStyle" parent="@style/Widget.MaterialComponents.Button"> <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.Button</item> <item name="android:textColor">?android:textColorPrimary</item> <item name="android:textAllCaps">false</item> - <item name="backgroundTint">?android:colorAccent</item> - <item name="rippleColor">@color/mtrl_btn_ripple_color</item> </style> <style name="OutlinedButtonStyle" parent="@style/Widget.MaterialComponents.Button.OutlinedButton"> |