diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-11 23:58:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-11 23:58:36 +0000 |
commit | 69e544a563c8590e63367d84a1590752587d59cc (patch) | |
tree | 78cf9f2c49d1f025c0d8e0d55bff8c58a79079b4 /library/main/res/values/attrs.xml | |
parent | f344307345a421dc89650799c38ad74ced44ee38 (diff) | |
parent | 3a3d478a4b8805992f9558fa8128261970d2ee99 (diff) | |
download | setupwizard-69e544a563c8590e63367d84a1590752587d59cc.tar.gz |
Merge "More app bar support in GlifLayout"
Diffstat (limited to 'library/main/res/values/attrs.xml')
-rw-r--r-- | library/main/res/values/attrs.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml index ffdf365..93e4da6 100644 --- a/library/main/res/values/attrs.xml +++ b/library/main/res/values/attrs.xml @@ -38,13 +38,14 @@ <!-- Push object to the end of its container, not changing its size. --> <flag name="end" value="0x00800005" /> </attr> + <attr name="suwGlifIconStyle" format="reference" /> <attr name="suwCardBackground" format="color|reference" /> - <attr name="suwFillContentLayoutStyle" format="reference" /> <attr name="suwDividerCondition"> <enum name="either" value="0" /> <enum name="both" value="1" /> </attr> + <attr name="suwFillContentLayoutStyle" format="reference" /> <attr name="suwListItemIconColor" format="color" /> <attr name="suwNavBarBackgroundColor" format="color" /> <attr name="suwNavBarButtonBackground" format="color|reference" /> @@ -104,6 +105,7 @@ <attr name="suwColorPrimary" /> <attr name="suwFooter" format="reference" /> <attr name="suwLayoutFullscreen" format="boolean" /> + <attr name="suwStickyHeader" format="reference" /> </declare-styleable> <declare-styleable name="SuwStatusBarBackgroundLayout"> |