commit 23c42748dce518b64ced25fa522eb855428692d6
author Vinod Krishnan <vinodkrishnan@google.com> Wed May 21 18:10:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 21 18:10:37 2014 +0000
tree d0d118271a6091edf76d9d72d4c25a8e660ea19d
parent 0a69ce6cf60f1e9cc5f50a192478d6e898d4fdaa
parent 82fa124c3a2753ce70c04973d8004b2b1950993d

am 82fa124c: am 4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev

* commit '82fa124c3a2753ce70c04973d8004b2b1950993d':
  Adding more DeviceDefault for CTS tests

core/res/res/values-watch/themes_device_defaults.xml

diff --git a/core/res/res/values-watch/themes_device_defaults.xml b/core/res/res/values-watch/themes_device_defaults.xml
index 705143c..63df5be 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>