diff options
author | Alan Viverette <alanv@google.com> | 2014-06-06 13:25:44 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2014-06-06 13:25:44 -0700 |
commit | b29010f268eaf1ad7f283da79ce411cb83e29127 (patch) | |
tree | 9a833dc13dfe0e13e70108113403c9393c51e4f0 /res/values | |
parent | 3d6ecaf4d3365eeaff75a4bedb57fbe136cf5f64 (diff) | |
download | android_packages_apps_ExactCalculator-b29010f268eaf1ad7f283da79ce411cb83e29127.tar.gz android_packages_apps_ExactCalculator-b29010f268eaf1ad7f283da79ce411cb83e29127.tar.bz2 android_packages_apps_ExactCalculator-b29010f268eaf1ad7f283da79ce411cb83e29127.zip |
DO NOT MERGE Material theme
Change-Id: I5caa8798b117c148607db5ed96c51b56e20a405d
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/styles.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index f561b98..a4f6dcf 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -17,13 +17,13 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="CalculatorTheme" parent="@android:style/Theme.Quantum.Light.NoActionBar"> + <style name="CalculatorTheme" parent="@android:style/Theme.Material.Light.NoActionBar"> <item name="android:navigationBarColor">@android:color/black</item> <item name="android:statusBarColor">@color/calculator_accent_color</item> <item name="android:windowContentOverlay">@null</item> </style> - <style name="DisplayEditTextStyle" parent="@android:style/Widget.Quantum.Light.EditText"> + <style name="DisplayEditTextStyle" parent="@android:style/Widget.Material.Light.EditText"> <item name="android:background">@android:color/transparent</item> <item name="android:cursorVisible">false</item> <item name="android:fontFamily">sans-serif-light</item> @@ -37,7 +37,7 @@ <item name="android:background">@drawable/display_shadow</item> </style> - <style name="PadButtonStyle" parent="@android:style/Widget.Quantum.Light.Button.Borderless"> + <style name="PadButtonStyle" parent="@android:style/Widget.Material.Light.Button.Borderless"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> <item name="android:background">@drawable/pad_btn_background</item> |