summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vinod Krishnan <vinodkrishnan@google.com> 2014-05-21 17:40:06 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-05-21 17:40:06 +0000
commit4f65a5456159b64185bb99c193bcff93b07770f8 (patch)
tree129bcd5d9e841833418460b13d2c2abd652545a6
parent7509733c8dfb4e65dbb45ab582e09d599dfaaa28 (diff)
parent9b8e4d01f6c54d7bfce303e5076da53e6d393e31 (diff)
Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
-rw-r--r--core/res/res/values-watch/themes_device_defaults.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/res/res/values-watch/themes_device_defaults.xml b/core/res/res/values-watch/themes_device_defaults.xml
index 705143c9f0d3..63df5beff76d 100644
--- a/core/res/res/values-watch/themes_device_defaults.xml
+++ b/core/res/res/values-watch/themes_device_defaults.xml
@@ -17,12 +17,15 @@
<style name="Theme.DeviceDefault" parent="Theme.Micro" />
<style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Micro" />
<style name="Theme.DeviceDefault.Dialog" parent="Theme.Micro.Dialog" />
+ <style name="Theme.DeviceDefault.DialogWhenLarge" parent="Theme.Micro.Dialog" />
<style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
<style name="Theme.DeviceDefault.Light" parent="Theme.Micro.Light" />
<style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Micro.Light" />
<style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Micro.Light" />
<style name="Theme.DeviceDefault.Light.Dialog" parent="Theme.Micro.Dialog" />
+ <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="Theme.Micro.Dialog" />
<style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Micro.Dialog.Alert" />
+ <style name="Theme.DeviceDefault.Wallpaper" parent="Theme.Micro" />
</resources>