diff options
| author | Ajay Nadathur <ajayns@google.com> | 2017-12-14 17:34:32 -0800 |
|---|---|---|
| committer | Ajay Nadathur <ajayns@google.com> | 2017-12-18 16:17:43 -0800 |
| commit | 7e2975b101dfd7a4e24c52918d3ed5e7d3ae820a (patch) | |
| tree | 2e553f60a52fab65982757b75f697ade7c29f30a | |
| parent | a820a7f85d1e7933a9d3e8b6d1e80fd7a1ca37bf (diff) | |
| download | setupwizard-7e2975b101dfd7a4e24c52918d3ed5e7d3ae820a.tar.gz | |
Update dialog styles to material 2
bug: 69930374
Test: Manually tested
Change-Id: I3921dc09dca9c11e7c5b86e29f3ab88436559578
| -rw-r--r-- | library/gingerbread/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | library/main/res/values-v22/styles.xml | 23 | ||||
| -rw-r--r-- | library/main/res/values/styles.xml | 2 |
3 files changed, 29 insertions, 0 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 1653938..5dab7db 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -277,4 +277,8 @@ <item name="suwNavBarButtonBackground">@drawable/suw_navbar_btn_bg_light</item> </style> + + <style name="SuwAlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert" /> + + <style name="SuwAlertDialogTheme.Light" parent="Theme.AppCompat.Light.Dialog.Alert" /> </resources> diff --git a/library/main/res/values-v22/styles.xml b/library/main/res/values-v22/styles.xml new file mode 100644 index 0000000..fc7efbf --- /dev/null +++ b/library/main/res/values-v22/styles.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources> + + <style name="SuwAlertDialogTheme" parent="android:Theme.DeviceDefault.Dialog.Alert" /> + + <style name="SuwAlertDialogTheme.Light" parent="android:Theme.DeviceDefault.Light.Dialog" /> +</resources>
\ No newline at end of file diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index 1d7d28b..ba93705 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -32,6 +32,7 @@ <item name="suwScrollIndicators">top|bottom</item> <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item> <!-- TODO: Change color --> <item name="android:editTextStyle">@style/SuwEditText</item> + <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SuwAlertDialogTheme</item> </style> <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light"> @@ -47,6 +48,7 @@ <item name="suwScrollIndicators">top|bottom</item> <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item> <item name="android:editTextStyle">@style/SuwEditText</item> + <item name="android:alertDialogTheme" tools:targetApi="honeycomb">@style/SuwAlertDialogTheme.Light</item> </style> <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2"> |