summaryrefslogtreecommitdiffstats
path: root/res/values/attrs.xml
diff options
context:
space:
mode:
authorMario Bertschler <bmario@google.com>2017-06-08 17:45:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-08 17:45:56 +0000
commit9483c6f4edf38abb35ae6185abafdb02ea0104ba (patch)
tree674aafeafceeebe2733ac8a6035f87c3e0772d87 /res/values/attrs.xml
parent4efee85b75651d416d0d55a3bf2e9a9b2cddf4f9 (diff)
parenta69369450281376cb207be554199bb4895843eb2 (diff)
downloadandroid_packages_apps_Trebuchet-9483c6f4edf38abb35ae6185abafdb02ea0104ba.tar.gz
android_packages_apps_Trebuchet-9483c6f4edf38abb35ae6185abafdb02ea0104ba.tar.bz2
android_packages_apps_Trebuchet-9483c6f4edf38abb35ae6185abafdb02ea0104ba.zip
Merge "Dark color on super light wallpaper support" into ub-launcher3-dorval-polish
Diffstat (limited to 'res/values/attrs.xml')
-rw-r--r--res/values/attrs.xml10
1 files changed, 9 insertions, 1 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1799b093e..b7189d17c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -23,7 +23,13 @@
<attr name="popupColorPrimary" format="color" />
<attr name="popupColorSecondary" format="color" />
<attr name="popupColorTertiary" format="color" />
- <attr name="isPrimaryColorDark" format="boolean" />
+ <attr name="isMainColorDark" format="boolean" />
+ <attr name="isWorkspaceDarkText" format="boolean" />
+ <attr name="workspaceTextColor" format="color" />
+ <attr name="workspaceShadowColor" format="color" />
+ <attr name="workspaceAmbientShadowColor" format="color"/>
+ <attr name="workspaceKeyShadowColor" format="color" />
+ <attr name="workspaceStatusBarScrim" format="reference" />
<!-- BubbleTextView specific attributes. -->
<declare-styleable name="BubbleTextView">
@@ -39,6 +45,8 @@
<attr name="deferShadowGeneration" format="boolean" />
<attr name="customShadows" format="boolean" />
<attr name="centerVertically" format="boolean" />
+ <attr name="ambientShadowColor" format="color" />
+ <attr name="keyShadowColor" format="color" />
</declare-styleable>
<!-- PagedView specific attributes. These attributes are used to customize